mirror of https://github.com/procxx/kepka.git
git subrepo clone --branch=stable https://github.com/procxx/cotire.git cotire
subrepo: subdir: "cotire" merged: "516d78476" upstream: origin: "https://github.com/procxx/cotire.git" branch: "stable" commit: "516d78476" git-subrepo: version: "0.3.1" origin: "???" commit: "???"
This commit is contained in:
Berkus Decker
Berkus Decker
parent
63669c1612
commit
32e988d251
|
|
@ -0,0 +1,8 @@
|
|||
*.sh eol=lf
|
||||
bootstrap eol=lf
|
||||
configure eol=lf
|
||||
*.[1-9] eol=lf
|
||||
|
||||
*.bat eol=crlf
|
||||
*.cmd eol=crlf
|
||||
*.vbs eol=crlf
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
# ignore CMake build directories
|
||||
*build*/
|
||||
.DS_Store
|
||||
.project
|
||||
.idea
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
; DO NOT EDIT (unless you know what you are doing)
|
||||
;
|
||||
; This subdirectory is a git "subrepo", and this file is maintained by the
|
||||
; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
|
||||
;
|
||||
[subrepo]
|
||||
remote = https://github.com/procxx/cotire.git
|
||||
branch = stable
|
||||
commit = 516d78476f6dda336181fc5514f72774e1e0a8e2
|
||||
parent = 5905d21fa7d8c2bbe0438b0d266945dcbbacb6f2
|
||||
cmdver = 0.3.1
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,21 @@
|
|||
# cotire example project
|
||||
|
||||
cmake_minimum_required(VERSION 2.8.12)
|
||||
|
||||
if (POLICY CMP0058)
|
||||
# Ninja requires custom command byproducts to be explicit
|
||||
cmake_policy(SET CMP0058 NEW)
|
||||
endif()
|
||||
|
||||
project (CotireExample)
|
||||
|
||||
set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
|
||||
|
||||
if (NOT CMAKE_VERSION VERSION_LESS "3.1.0")
|
||||
set (CMAKE_CXX_STANDARD "98")
|
||||
set (CMAKE_CXX_EXTENSIONS OFF)
|
||||
endif()
|
||||
|
||||
include(cotire)
|
||||
|
||||
add_subdirectory(src)
|
||||
|
|
@ -0,0 +1,341 @@
|
|||
## 1.7.10 (2017-06-16)
|
||||
|
||||
* CMake 3.8 compatibility.
|
||||
* CMake 3.8.0 Qt automoc support (thanks bilke).
|
||||
* fix Xcode recompiling every time builds happen (thanks gcamp).
|
||||
* disable PCH messages when `-Wno-pch-messages` flag exists (thanks kbinani).
|
||||
* work around ccache incompatibility with newer versions of GCC and Clang.
|
||||
* fix MinGW incompatibility with `BUILD_INTERFACE` generator expression.
|
||||
* fix handling of `CMAKE_INCLUDE_FLAG_SEP_<LANG>` variables.
|
||||
|
||||
## 1.7.9 (2016-12-08)
|
||||
|
||||
* CMake 3.6 and 3.7 compatibility.
|
||||
* fix ccache 3.2 compatibility issues.
|
||||
* fix bugs with handling language standard related properties (e.g., `CXX_STANDARD`, `CXX_EXTENSIONS`).
|
||||
* make prefix header generation and precompiled header compilation depend on the compiler executable.
|
||||
* fix Qt automoc handling for Windows (thanks jcelerier).
|
||||
* convert Windows paths in include directories to CMake paths (thanks wdx04).
|
||||
* replace object library with corresponding unity object library when using `COPY_UNITY` linking strategy.
|
||||
* better error reporting from prefix header generation.
|
||||
|
||||
## 1.7.8 (2016-03-27)
|
||||
|
||||
* fix `COPY_UNITY` linking strategy for private link dependencies.
|
||||
* honor `CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE` upon handling of target usage requirements.
|
||||
* reworked setting up of `LINK_LIBRARIES` and `INTERFACE_LINK_LIBRARIES` properties for unity targets.
|
||||
|
||||
## 1.7.7 (2016-03-20)
|
||||
|
||||
* CMake 3.5 compatibility.
|
||||
* fix bugs related to handling of interface libraries.
|
||||
* output shorter log messages when using Visual Studio IDE.
|
||||
* don't disable PCH if CMAKE_<LANG>_COMPILER_ID is not set (thanks jcelerier).
|
||||
* add support for compiler launchers introduced in CMake 3.4 (thanks misery).
|
||||
|
||||
## 1.7.6 (2015-12-06)
|
||||
|
||||
* fix CMake 3.4 compatibility issues.
|
||||
* prevent redundant re-generation of prefix header when a target has generated source files.
|
||||
|
||||
## 1.7.5 (2015-10-27)
|
||||
|
||||
* handle visibility target properties (`CXX_VISIBILITY_PRESET` and `VISIBILITY_INLINES_HIDDEN`).
|
||||
* better handling of include directories and system include directories.
|
||||
* parse additional system include directories from target compile flags.
|
||||
* activate select CMake policies.
|
||||
|
||||
## 1.7.4 (2015-10-10)
|
||||
|
||||
* set up single unity source file for prefix header generation.
|
||||
* increase MSVC default PCH memory to 128M.
|
||||
* remove obsolete code.
|
||||
|
||||
## 1.7.3 (2015-07-25)
|
||||
|
||||
* handle language standard target properties (e.g., `CXX_STANDARD`).
|
||||
* apply user provided prefix header to unity build target.
|
||||
* remove effect of `COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES` on generated unity target.
|
||||
* manual updates.
|
||||
|
||||
## 1.7.2 (2015-04-22)
|
||||
|
||||
* reduce configure time overhead.
|
||||
* fix bug with dependency checking when using Xcode.
|
||||
* remove obsolete code required for CMake versions older than 2.8.12.
|
||||
* streamline debugging output.
|
||||
|
||||
## 1.7.1 (2015-04-06)
|
||||
|
||||
* fix problem with CMake's automatic Qt processing for generated unity targets.
|
||||
* added a section on common pitfalls when using cotire to the manual.
|
||||
* remove obsolete code required for CMake versions older than 2.8.12.
|
||||
* streamline debugging output.
|
||||
* activate select CMake policies.
|
||||
|
||||
## 1.7.0 (2015-03-29)
|
||||
|
||||
* fix CMake 3.2 compatibility issues.
|
||||
* cotire now requires CMake 2.8.12 or newer.
|
||||
* copy `IMPORT_PREFIX` and `IMPORT_SUFFIX` target properties for unity targets (thanks peterhuene).
|
||||
* new property `COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH` allows for organizing includes
|
||||
added to the prefix header by priority (thanks ArnaudD-FR).
|
||||
* for Visual Studio C++, increase static precompiled header memory allocation.
|
||||
* the default strategy for setting up a unity target's linked libraries is now `COPY_UNITY`.
|
||||
* for Qt projects, fix problem with handling of `AUTOMOC` in generated unity target.
|
||||
* fix problem with generating the cotire intermediate directory.
|
||||
* documentation updates.
|
||||
|
||||
## 1.6.9 (2015-01-18)
|
||||
|
||||
* fix bug with parsing of localized MSVC `/showIncludes` output.
|
||||
|
||||
## 1.6.8 (2014-12-28)
|
||||
|
||||
* fix bug with generation of unity source file segments for parallel builds.
|
||||
|
||||
## 1.6.7 (2014-12-21)
|
||||
|
||||
* fix CMake 3.1 compatibility issues.
|
||||
* fix ccache 3.2 compatibility issues.
|
||||
* handle `COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES` correctly for mixed-language targets.
|
||||
* correctly compute absolute paths of generated source files added to the unity source file.
|
||||
* fix bug with checking unity source and prefix header dependencies under Xcode.
|
||||
* fix bug with handling of unity source file dependencies.
|
||||
* move code to determine build configurations to function of its own.
|
||||
* documentation updates.
|
||||
|
||||
## 1.6.6 (2014-09-21)
|
||||
|
||||
* fix GCC issue with prefix header generation when source files are missing.
|
||||
* fix bug where some target properties were not properly propagated to the generated unity target.
|
||||
* use `target_link_libraries` to set up the unity target link libraries.
|
||||
* add Qt4 and Qt5 examples to the `Patches` directory.
|
||||
* documentation updates.
|
||||
|
||||
## 1.6.5 (2014-08-26)
|
||||
|
||||
* correctly handle generator expressions used in compile definitions, compile flags and include
|
||||
directories (requires CMake 2.8.12 or newer).
|
||||
* fix `-isystem` includes being incorrectly passed to `execute_process` (thanks nickhutchinson).
|
||||
* make some error messages more verbose.
|
||||
|
||||
## 1.6.4 (2014-07-14)
|
||||
|
||||
* fix CMake 3.0 compatibility issues.
|
||||
* preserve system flag for includes when generating PCH (thanks gjasny).
|
||||
* fix bug with setting up `EXPORTS` symbol for shared libraries.
|
||||
|
||||
## 1.6.3 (2014-06-11)
|
||||
|
||||
* correctly handle usage requirements for transitive link targets.
|
||||
* use indirect inclusion for prefix header when using generator Xcode.
|
||||
|
||||
## 1.6.2 (2014-06-09)
|
||||
|
||||
* don't use `-w` flag for pre-compiling the prefix header, because it has unwanted side effects.
|
||||
* correctly handle linked targets' `INTERFACE_COMPILE_OPTIONS`, `INTERFACE_INCLUDE_DIRECTORIES`
|
||||
and `INTERFACE_COMPILE_DEFINITIONS` properties upon pre-compiling and prefix header generation.
|
||||
* For Clang and GCC, pre-compile prefix header through indirect inclusion via a prefix source file,
|
||||
to make both compilers honor the `system_header` pragma in the prefix header correctly.
|
||||
* fix ccache incompatibility.
|
||||
|
||||
## 1.6.1 (2014-04-20)
|
||||
|
||||
* fixed bug where precompiled headers did not work with Clang (thanks to nh2 for reporting).
|
||||
* when using ccache, require that environment variable `CCACHE_SLOPPINESS` is set to `time_macros`.
|
||||
|
||||
## 1.6.0 (2014-03-16)
|
||||
|
||||
* suppress compiler warnings from precompiled headers.
|
||||
* fix Clang compatibility issue with prefix header generation.
|
||||
* use file extension `.pch` for precompiled headers generated with Clang.
|
||||
* manual updates.
|
||||
|
||||
## 1.5.2 (2014-01-17)
|
||||
|
||||
* honor framework includes under OS X correctly.
|
||||
* fix handling of OS X specific variables `CMAKE_OSX_SYSROOT` and `CMAKE_OSX_DEPLOYMENT_TARGET`.
|
||||
* add new examples to the `Patches` directory.
|
||||
|
||||
## 1.5.1 (2013-11-12)
|
||||
|
||||
* fixed string quoting bugs.
|
||||
|
||||
## 1.5.0 (2013-10-13)
|
||||
|
||||
* CMake 2.8.12 compatibility fixes.
|
||||
* Upon generation of a unity target, cotire can now be configured to automatically copy all the
|
||||
linked libraries and targets from the original target. See the section on the new target property
|
||||
`COTIRE_UNITY_LINK_LIBRARIES_INIT` in the cotire manual.
|
||||
* fixed bug with copying target properties to generated unity target.
|
||||
* cotire manual updates.
|
||||
* add new examples to the `Patches` directory.
|
||||
* fix typos.
|
||||
|
||||
## 1.4.3 (2013-09-28)
|
||||
|
||||
* fixed bug with generation of unity source file when `COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES` is
|
||||
set to 0.
|
||||
|
||||
## 1.4.2 (2013-08-24)
|
||||
|
||||
* CMake 2.8.11 compatibility fixes.
|
||||
* always force the inclusion of a user provided prefix header, even if the target
|
||||
contains too few sources to enable the use of a precompiled header.
|
||||
|
||||
## 1.4.1 (2013-06-08)
|
||||
|
||||
* fixed bug with determination of compiler version.
|
||||
* fixed bug with generation of unity source when target source files are used for multiple targets.
|
||||
* fixed bug with multi-core optimized prefix header generation.
|
||||
|
||||
## 1.4.0 (2013-03-11)
|
||||
|
||||
* one year anniversary release.
|
||||
* add support for multi-core optimized unity builds for some CMake generators.
|
||||
* add support for multi-core optimized prefix header generation.
|
||||
* add more examples to cotire manual.
|
||||
|
||||
## 1.3.6 (2013-03-06)
|
||||
|
||||
* fix bug with prefix header initialization for generator Xcode.
|
||||
* print cotire version upon inclusion.
|
||||
|
||||
## 1.3.5 (2013-03-01)
|
||||
|
||||
* fix typos in function names and property descriptions.
|
||||
|
||||
## 1.3.4 (2013-02-07)
|
||||
|
||||
* fixed bug with computing to output directory of the generated unity target (thanks shaunew).
|
||||
* fixed wrong variable reference in debugging output (thanks shaunew).
|
||||
|
||||
## 1.3.3 (2013-02-03)
|
||||
|
||||
* fixed bug with handling of policy CMP0018 relating to target property `POSITION_INDEPENDENT_CODE`.
|
||||
* fixed warnings relating to uninitialized variables.
|
||||
* Intel XE 2013 Update 2 compatibility fixes.
|
||||
|
||||
## 1.3.2 (2013-02-02)
|
||||
|
||||
* fixed missing curly brace (thanks shaunew).
|
||||
|
||||
## 1.3.1 (2013-01-29)
|
||||
|
||||
* fix bug with filtering of compile options.
|
||||
|
||||
## 1.3.0 (2013-01-09)
|
||||
|
||||
* add support for Intel C and C++ compilers.
|
||||
* CMake 2.8.10 compatibility fixes.
|
||||
* properly clean up generated cotire log files upon invoking `clean` target.
|
||||
* documentation updates.
|
||||
|
||||
## 1.2.0 (2012-11-01)
|
||||
|
||||
* add support for manually maintained prefix header and unity source files.
|
||||
* the target property `COTIRE_<LANG>_PREFIX_HEADER_INIT` can be set to a user provided prefix
|
||||
header file to be used instead of the automatically generated one (e.g., `stdafx.h`).
|
||||
* the new target property `COTIRE_<LANG>_UNITY_SOURCE_INIT` can be set to a user provided unity
|
||||
source file to be used instead of the automatically generated one.
|
||||
* the target property `COTIRE_UNITY_TARGET_NAME` is no longer read-only. It can be set to the
|
||||
desired name of the unity target that will be added by cotire.
|
||||
* add parameters `SOURCE_DIR` and `BINARY_DIR` to function `cotire` to allow for explicitly
|
||||
specifying a target's source and binary directory, if target to be cotired has been added in a
|
||||
different directory.
|
||||
|
||||
## 1.1.8 (2012-10-27)
|
||||
|
||||
* when using MSVC, apply option `/bigobj` to compilation of generated unity files.
|
||||
|
||||
## 1.1.7 (2012-10-26)
|
||||
|
||||
* cope with double slash characters in scanned include paths.
|
||||
|
||||
## 1.1.6 (2012-09-22)
|
||||
|
||||
* check result code upon scanning includes.
|
||||
* always add a `clean_cotire` target to easily clean up cotire generated files.
|
||||
* add section on `extern "C"` linkage issues to manual.
|
||||
|
||||
## 1.1.5 (2012-08-17)
|
||||
|
||||
* new cache variable `COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS` can be set to globally exclude
|
||||
sources with the listed file extensions from the generated unity source.
|
||||
* fix check for multi-architecture builds under OS X.
|
||||
|
||||
## 1.1.4 (2012-08-15)
|
||||
|
||||
* prevent redundant re-generation of the unity source, prefix header and precompiled header files
|
||||
(this makes cotire more applicable to C++ projects that use Qt).
|
||||
|
||||
## 1.1.3 (2012-08-12)
|
||||
|
||||
* fix out of range index operation upon building list of target include directories.
|
||||
* honor target properties `POSITION_INDEPENDENT_CODE` and `NO_SONAME` introduced with CMake 2.8.9.
|
||||
* make selection of target source files for requested target language more careful.
|
||||
* prevent modification of the CMake policy stack upon CMake version check.
|
||||
|
||||
## 1.1.2 (2012-05-06)
|
||||
|
||||
* make handling of include directories more robust against invalid paths.
|
||||
|
||||
## 1.1.1 (2012-04-20)
|
||||
|
||||
* fixed bug with generation of unity targets for `WIN32_EXECUTABLE` targets.
|
||||
* fixed bug with parsing of localized MSVC `/showIncludes` output.
|
||||
|
||||
## 1.1.0 (2012-04-19)
|
||||
|
||||
* tested with CMake 2.8.8.
|
||||
* added example to manual that shows how to apply cotire to CMake object library targets.
|
||||
* fixed multiple bugs with handling of CMake single build type and multiple configuration builds.
|
||||
* added more robust parsing of localized MSVC `/showIncludes` output.
|
||||
|
||||
## 1.0.9 (2012-04-09)
|
||||
|
||||
* add support for compiler wrappers like ccache.
|
||||
* under OS X, apply `CMAKE_OSX_SYSROOT` to prefix header include and ignore paths.
|
||||
|
||||
## 1.0.8 (2012-04-05)
|
||||
|
||||
* require CMake 2.8.6 since we are using `set_property` option `APPEND_STRING`.
|
||||
|
||||
## 1.0.7 (2012-04-02)
|
||||
|
||||
* add support for Ninja generator introduced in CMake 2.8.8.
|
||||
* fix bug with initialization of variable `COTIRE_VERBOSE`.
|
||||
|
||||
## 1.0.6 (2012-04-01)
|
||||
|
||||
* correctly handle builds where both `CMAKE_BUILD_TYPE` and `CMAKE_CONFIGURATION_TYPES` are set.
|
||||
|
||||
## 1.0.5 (2012-03-26)
|
||||
|
||||
* fix Visual Studio C++ 2010 compilation of example project.
|
||||
* enhance heuristic for #include_next directive detection.
|
||||
* fix llvm-3.0.src.patch for GCC 4.6 compilation.
|
||||
|
||||
## 1.0.4 (2012-03-24)
|
||||
|
||||
* honor target property INCLUDE_DIRECTORIES introduced in CMake 2.8.8.
|
||||
|
||||
## 1.0.3 (2012-03-23)
|
||||
|
||||
* handle OBJECT_LIBRARY targets introduced in CMake 2.8.8.
|
||||
* use predefined compiler version variable, if available.
|
||||
|
||||
## 1.0.2 (2012-03-16)
|
||||
|
||||
* fix Xcode 4.3 compatibility.
|
||||
* Cotire manual corrections.
|
||||
|
||||
## 1.0.1 (2012-03-15)
|
||||
|
||||
* Cotire manual corrections.
|
||||
* Add prefix header to the generated unity build target.
|
||||
|
||||
## 1.0.0 (2012-03-11)
|
||||
|
||||
* First release.
|
||||
|
|
@ -0,0 +1,795 @@
|
|||
cotire manual
|
||||
=============
|
||||
|
||||
Cotire (compile time reducer) is a CMake module that speeds up the build process of CMake based
|
||||
build systems by fully automating techniques as [precompiled header][pch] usage and
|
||||
[single compilation unit][scu] builds for C and C++.
|
||||
|
||||
motivation
|
||||
----------
|
||||
|
||||
Cotire was born out of a dissatisfaction with the existing CMake solutions for adding
|
||||
[precompiled header][1260] support and unity build support to CMake based build systems.
|
||||
The design of cotire tries to adhere to the following principles:
|
||||
|
||||
#### as automatic as possible
|
||||
|
||||
[Precompiled header][pch] and [unity builds][scu] are good ideas in principle, but in reality
|
||||
they do not work if the burden of maintaining the required additional source files (a
|
||||
[prefix header][pfh] and a unity source file) is put on the developer. A modern build system
|
||||
like CMake provides enough context information to have the build system generate and update
|
||||
these files automatically.
|
||||
|
||||
#### non-intrusive
|
||||
|
||||
The configuration of precompiled headers usage and single computation unit builds belongs to the
|
||||
build system and not in the source code. Nobody wants to litter one's source files with `hdrstop`
|
||||
pragmas or be forced to add an include directive to every file. Source code should build properly
|
||||
when a precompiled header isn't used and should build faster when a precompiled header is used.
|
||||
|
||||
#### minimal interface
|
||||
|
||||
Maintaining a build system over time is enough work and the CMake language may often get in your
|
||||
way. Thus the solution should only add few public CMake functions. It should be easy to integrate
|
||||
it into an existing CMake based build system and it should be just as easy to remove it again.
|
||||
|
||||
#### lazy file creation
|
||||
|
||||
The additional source files needed for precompiled header support and unity build support should
|
||||
only be created when they are required for the compilation of a target. Thus the solution should
|
||||
not create these files upon configuring the project, but should set up custom build commands for
|
||||
the creation of these files that only kick in when the files are required to exist by the build
|
||||
process.
|
||||
|
||||
#### cross-platform
|
||||
|
||||
C/C++ Compilers and IDEs on different platforms vary widely in how the implement precompiled
|
||||
header support. The solution should hide these implementation details and present a uniform
|
||||
interface to the developer on all supported platforms.
|
||||
|
||||
cotire basic usage
|
||||
------------------
|
||||
|
||||
Cotire consists of a single CMake module file, which can be easily added to an existing CMake
|
||||
project.
|
||||
|
||||
The file `CMake/cotire.cmake` needs to be copied to the module directory of a CMake project. In the
|
||||
top-level `CMakeList.txt` file, the module directory needs to be added to the CMake module search
|
||||
path:
|
||||
|
||||
set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
|
||||
|
||||
To use cotire in a CMake project, one adds the following include directive to the beginning of the
|
||||
top-level `CMakeList.txt`:
|
||||
|
||||
include(cotire)
|
||||
|
||||
To speed the build process of a CMake library or executable target, the `cotire` function is
|
||||
applied to a CMake target. From the example project that ships with cotire:
|
||||
|
||||
add_executable(example main.cpp example.cpp log.cpp log.h example.h)
|
||||
...
|
||||
cotire(example)
|
||||
|
||||
Cotire looks at the properties of the target provided by CMake (e.g., target type, source files,
|
||||
compile flags, preprocessor defines, include directories, ...) and modifies the target's build
|
||||
process in the following way:
|
||||
|
||||
1. cotire adds a custom build rule to produce a unity source file from the target's sources.
|
||||
2. cotire adds a custom build rule to produce a prefix header file by tracking the header files
|
||||
included by the target's sources.
|
||||
3. cotire adds a custom build rule to produce a precompiled header from the prefix header.
|
||||
4. cotire modifies the target's compile flags to make use of the generated precompiled header.
|
||||
5. cotire adds a couple of new targets.
|
||||
|
||||
For makefile based build systems, running `make help` in the terminal reveals the new targets:
|
||||
|
||||
$ make help
|
||||
...
|
||||
... all_pch
|
||||
... all_unity
|
||||
... clean_cotire
|
||||
... example
|
||||
... example_pch
|
||||
... example_unity
|
||||
|
||||
The `example_pch` target triggers the compilation of the precompiled header and as a side effect
|
||||
the generation of the unity source and the prefix header. The target `clean_cotire` cleans up all
|
||||
files generated by cotire. The `example_unity` target produces the same output as the original
|
||||
`example` target, but does so by performing a unity build. The `all_pch` and `all_unity` serve as
|
||||
pool targets for all cotired project targets.
|
||||
|
||||
By default, the `example_unity` target inherits all build settings from the original target
|
||||
`example` including linked libraries and target dependencies.
|
||||
|
||||
cotire generated files
|
||||
----------------------
|
||||
|
||||
For a target that has been cotired, three files will be generated as part of the build process:
|
||||
|
||||
### the unity source
|
||||
|
||||
The unity source file is generated from the target by querying the target's `SOURCES` property.
|
||||
It consists of preprocessor include directives for each of the target source files. The files
|
||||
are included in the same order that is used in the CMake `add_executable` or `add_library` call.
|
||||
Header files are omitted.
|
||||
|
||||
This is a unity source generated for the example project under OS X:
|
||||
|
||||
#ifdef __cplusplus
|
||||
#include "/Users/sakra/Documents/cotire/src/main.cpp"
|
||||
#include "/Users/sakra/Documents/cotire/src/example.cpp"
|
||||
#include "/Users/sakra/Documents/cotire/src/log.cpp"
|
||||
#endif
|
||||
|
||||
The unity source file uses absolute paths to include the target's source file. The file is not
|
||||
intended to be portable across different build folders or machines. It is an intermediate file
|
||||
tied to the build folder that is automatically recreated by the build system if it is missing.
|
||||
|
||||
For multi-core machines cotire can be configured to generate multiple unity file segments that
|
||||
can be built in parallel by the chosen CMake generator (see below).
|
||||
|
||||
### the prefix header
|
||||
|
||||
The prefix header is produced from the unity source file by running the unity file through the
|
||||
preprocessor and keeping track of each header file used (this is done by using option `-H` with
|
||||
GCC / Clang and `/showIncludes` with Visual Studio C++). The path of each used header file is
|
||||
compared against an exclude directory list and an include directory list to decide if the header
|
||||
file should be added to the prefix header.
|
||||
|
||||
By default the include directory list is empty and the exclude directory list is initialized to
|
||||
`"${CMAKE_SOURCE_DIR};${CMAKE_BINARY_DIR}"`. This default setting guarantees that project headers
|
||||
which are likely to be changed frequently are not added to the prefix header.
|
||||
|
||||
Upon generation of the prefix header cotire makes sure that target compile options, include path
|
||||
settings and preprocessor defines (e.g., `NDEBUG`) that affect the outcome of the preprocessor
|
||||
are correctly set up.
|
||||
|
||||
Generating the prefix header from the unity source is much faster than running each individual
|
||||
target source file through the preprocessor, because the coalesced unity source will make the
|
||||
preprocessor process most header files only once.
|
||||
|
||||
This is a prefix header produced for the example project with Visual Studio 2013 under Windows 7:
|
||||
|
||||
#pragma warning(push, 0)
|
||||
#ifdef __cplusplus
|
||||
#include "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\string"
|
||||
#include "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\algorithm"
|
||||
#include "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\iostream"
|
||||
#endif
|
||||
#pragma warning(pop)
|
||||
|
||||
Generating the prefix file under Ubuntu 12.04 with GCC 4.6 yields the following result:
|
||||
|
||||
#pragma GCC system_header
|
||||
#ifdef __cplusplus
|
||||
#include "/usr/include/c++/4.6/string"
|
||||
#include "/usr/include/c++/4.6/algorithm"
|
||||
#include "/usr/include/c++/4.6/iterator"
|
||||
#include "/usr/include/c++/4.6/iostream"
|
||||
#endif
|
||||
|
||||
Using Xcode 5.1 under OS X 10.9, this is the resulting prefix header:
|
||||
|
||||
#pragma clang system_header
|
||||
#ifdef __cplusplus
|
||||
#include "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/string"
|
||||
#include "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/iostream"
|
||||
#endif
|
||||
|
||||
Besides include directives, cotire also adds compiler specific pragmas to the generated prefix
|
||||
header to suppress compiler warnings upon inclusion.
|
||||
|
||||
Cotire attempts to produce a minimal list of header files by omitting header files indirectly
|
||||
included by a header that is already part of the prefix header. Header files with nonstandard
|
||||
file extensions like `.inl`, `.inc` of `.ipp` are omitted by default.
|
||||
|
||||
The generated prefix file includes the selected header files by their absolute paths. This speeds
|
||||
up the precompiling of the prefix header because the compiler does not have to search for header
|
||||
files in include directories again.
|
||||
|
||||
The prefix header is tailored to the CMake target that it is generated for. It is tied to the
|
||||
compiler environment of the local machine and is not portable across different compilers or
|
||||
machines. It is automatically recreated by the build system if it goes missing.
|
||||
|
||||
The generated prefix header can be applied to a different target added in the same source directory
|
||||
(see below).
|
||||
|
||||
Optionally, cotire will also create a prefix source file that consists of a single include directive
|
||||
for the prefix header. This file is needed for pre-compiling the prefix header with Clang or GCC
|
||||
to make both compilers handle the `system_header` pragma correctly.
|
||||
|
||||
### the precompiled header
|
||||
|
||||
The precompiled header is produced from the generated prefix header by using the proprietary
|
||||
precompiling mechanism depending on the compiler used. For GCC and Clang cotire sets up a custom
|
||||
build rule and generates the precompiled header as described in the documentation for
|
||||
[GCC][gcc_pch] and [Clang][clang_pch]. Cotire then modifies the `COMPILE_FLAGS` property of the
|
||||
target to force the inclusion of the prefix header.
|
||||
|
||||
Visual Studio C++ and Intel C++ use a [different approach][msvc_pch] to pre-compiling. Both
|
||||
compilers require a host source file to generate the precompiled header as a side effect of
|
||||
producing an object file. Cotire modifies the `COMPILE_FLAGS` of the first target source file to
|
||||
[generate][msvc_pch_create] the precompiled header and then modifies the `COMPILE_FLAGS` of the
|
||||
remaining target source files to [include][msvc_pch_use] the generated precompiled header.
|
||||
|
||||
For Xcode projects generated with CMake, cotire completely hands off the pre-compilation of
|
||||
the prefix header and the inclusion of the precompiled header to the IDE. Cotire attaches a
|
||||
pre-build action to the target which generates the unity source file and the prefix header.
|
||||
Cotire then modifies Xcode attributes of the generated Xcode project to have Xcode precompile the
|
||||
the generated prefix header with the Xcode build steps `ProcessPCH` for C sources and
|
||||
`ProcessPCH++` for C++ sources.
|
||||
|
||||
For precompiled headers creation flags must match use flags exactly. Cotire uses the same flags,
|
||||
include directories and preprocessor defines that are used for the compilation of source files
|
||||
for the generation of the precompiled header. Thus the resulting precompiled header binary is only
|
||||
usable for the target and cannot be re-used for a different CMake target.
|
||||
|
||||
cotire advanced usage
|
||||
---------------------
|
||||
|
||||
### applying cotire to multiple targets at the same time
|
||||
|
||||
The `cotire` function can be applied to multiple targets added in the same source directory in one
|
||||
call:
|
||||
|
||||
add_library(libA STATIC ...)
|
||||
add_library(libB SHARED ...)
|
||||
add_executable(example ...)
|
||||
...
|
||||
cotire(example libA libB)
|
||||
|
||||
### mixed-language targets
|
||||
|
||||
Cotire is able to speed up the build process of mixed language targets, consisting of both C and
|
||||
C++ sources. It generates a separate set of unity source files, prefix headers and precompiled
|
||||
headers for both languages and modifies the `COMPILE_FLAGS` of each target source file to include
|
||||
the correct precompiled header depending on the compilation language of the source file.
|
||||
|
||||
### obtaining the names of the generated files and targets
|
||||
|
||||
For a cotired target the target properties `COTIRE_<LANG>_UNITY_SOURCE`,
|
||||
`COTIRE_<LANG>_PREFIX_HEADER`, `COTIRE_<LANG>_PRECOMPILED_HEADER` will be set to the paths of the
|
||||
generated files (`<LANG>` can be set to `CXX` or `C`). The target property
|
||||
`COTIRE_UNITY_TARGET_NAME` will be set to the name of the generated unity target:
|
||||
|
||||
cotire(example)
|
||||
...
|
||||
get_target_property(_unitySource example COTIRE_CXX_UNITY_SOURCE)
|
||||
get_target_property(_prefixHeader example COTIRE_CXX_PREFIX_HEADER)
|
||||
get_target_property(_precompiledHeader example COTIRE_CXX_PRECOMPILED_HEADER)
|
||||
get_target_property(_unityTargetName example COTIRE_UNITY_TARGET_NAME)
|
||||
|
||||
If a source file's `COMPILE_FLAGS` are modified by cotire, it sets the source file property
|
||||
`COTIRE_TARGET` to the name of the target, that the source file's build command has been
|
||||
altered for:
|
||||
|
||||
cotire(example)
|
||||
...
|
||||
get_source_file_property(_cotireTargetName "example.cpp" COTIRE_TARGET)
|
||||
if (_cotireTargetName)
|
||||
message(STATUS "example.cpp has been cotired for target ${_cotireTargetName}")
|
||||
endif()
|
||||
|
||||
### changing the name of the generated unity build target
|
||||
|
||||
By default cotire uses the name of the the original target with the suffix `_unity` appended
|
||||
for the name of the generated unity build target. To create the unity build target under a
|
||||
different name, set the `COTIRE_UNITY_TARGET_NAME` property:
|
||||
|
||||
add_executable(example_template main.cpp example.cpp log.cpp log.h example.h)
|
||||
set_target_properties(example_template PROPERTIES COTIRE_UNITY_TARGET_NAME "example")
|
||||
...
|
||||
cotire(example_template)
|
||||
|
||||
Invoking the `example` target will then run the unity build.
|
||||
|
||||
### restricting cotire to certain build configurations
|
||||
|
||||
To restrict the cotire related modifications to the build process to certain build configurations,
|
||||
the `CONFIGURATIONS` parameter can be added to the `cotire` call.
|
||||
|
||||
cotire(example CONFIGURATIONS Release MinSizeRel)
|
||||
|
||||
For single build type builds the selected configuration will be checked at configure time, for
|
||||
multi-configuration builds the check will be done at build time.
|
||||
|
||||
It is recommended to have at least one build configuration that does not make use of cotire to
|
||||
ensure that the project builds properly without cotire.
|
||||
|
||||
### disabling precompiled headers and unity builds
|
||||
|
||||
If the target's build process should not be modified to make use of the generated precompiled
|
||||
header, the target property `COTIRE_ENABLE_PRECOMPILED_HEADER` can be set to `FALSE`:
|
||||
|
||||
set_target_properties(example PROPERTIES COTIRE_ENABLE_PRECOMPILED_HEADER FALSE)
|
||||
cotire(example)
|
||||
|
||||
If a unity build target should not be added by cotire, the target property
|
||||
`COTIRE_ADD_UNITY_BUILD` can be set to `FALSE`:
|
||||
|
||||
set_target_properties(example PROPERTIES COTIRE_ADD_UNITY_BUILD FALSE)
|
||||
cotire(example)
|
||||
|
||||
The property `COTIRE_ADD_UNITY_BUILD` only affects the addition of the unity build target. Custom
|
||||
build rules for the generation of the unity source file will always be set up, because the
|
||||
unity source file is needed for the generation of the prefix header.
|
||||
|
||||
Both properties default to `TRUE`. If both are set to `FALSE`, cotire will only set up custom build
|
||||
rules for the generation of the unity source and the prefix header.
|
||||
|
||||
The properties `COTIRE_ENABLE_PRECOMPILED_HEADER` and `COTIRE_ADD_UNITY_BUILD` can also be set on
|
||||
directories. A target inherits the property value from its enclosing directory.
|
||||
|
||||
### disabling precompiled headers for small targets
|
||||
|
||||
The cache variable `COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES` can be set to the minimum number of
|
||||
source files required to enable the use of a precompiled header. It defaults to 3. To override the
|
||||
default, run `cmake` with the following options:
|
||||
|
||||
$ cmake -D COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES=5 <path-to-source>
|
||||
|
||||
### using a manually maintained prefix header instead of the automatically generated one
|
||||
|
||||
cotire can be configured to use an existing manually maintained prefix header (e.g., Visual Studio
|
||||
projects often use a prefix header named `stdafx.h`) instead of the automatically generated one.
|
||||
Set the target property `COTIRE_CXX_PREFIX_HEADER_INIT` to the path of the existing prefix header
|
||||
file. The path is interpreted relative to the target source directory:
|
||||
|
||||
set_target_properties(example PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "stdafx.h")
|
||||
cotire(example)
|
||||
|
||||
If the prefix header `stdafx.h` needs an accompanying source file (e.g., `stdafx.cpp`) in order
|
||||
to be precompiled properly, that source file needs to be the first one on the list of source
|
||||
files in the target's `add_executable` or `add_library` call.
|
||||
|
||||
The property `COTIRE_CXX_PREFIX_HEADER_INIT` can also be set to a list of header files which will
|
||||
then make up the contents of the generated prefix header.
|
||||
|
||||
A manually maintained prefix header will always be applied to the corresponding target,
|
||||
even if the target contains too few sources to enable the use of a precompiled header.
|
||||
|
||||
### using a generated prefix header for multiple targets
|
||||
|
||||
A prefix header that is generated for a cotired target can be applied to a different target
|
||||
added in the same source directory:
|
||||
|
||||
cotire(example)
|
||||
get_target_property(_prefixHeader example COTIRE_CXX_PREFIX_HEADER)
|
||||
...
|
||||
set_target_properties(other_target PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${_prefixHeader}")
|
||||
cotire(other_target)
|
||||
|
||||
The compilation of either target will trigger the generation of the prefix header.
|
||||
|
||||
### configuring the generation of the prefix header
|
||||
|
||||
There are multiple target properties which affect the generation of the prefix header:
|
||||
|
||||
* `COTIRE_PREFIX_HEADER_IGNORE_PATH` can be set to a semicolon separated list of directories. If a
|
||||
header file is found in one of these directories or sub-directories, it will be excluded from the
|
||||
generated prefix header.
|
||||
|
||||
* `COTIRE_PREFIX_HEADER_INCLUDE_PATH` can be set to a semicolon separated list of directories. If
|
||||
a header file is included from one of these directories or sub-directories, it will be included
|
||||
in the generated prefix header.
|
||||
|
||||
If a header file is matched by both `COTIRE_PREFIX_HEADER_IGNORE_PATH` and
|
||||
`COTIRE_PREFIX_HEADER_INCLUDE_PATH`, the option which yields the closer relative path match wins.
|
||||
For example, if third-party libraries are part of the source tree in a directory called `Libs`,
|
||||
the following setting will make cotire select header files from the third-party directory, but
|
||||
ignore other project related headers in `CMAKE_SOURCE_DIR`:
|
||||
|
||||
set_target_properties(example PROPERTIES
|
||||
COTIRE_PREFIX_HEADER_IGNORE_PATH "${CMAKE_SOURCE_DIR}"
|
||||
COTIRE_PREFIX_HEADER_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/Libs")
|
||||
|
||||
The properties `COTIRE_PREFIX_HEADER_IGNORE_PATH` and `COTIRE_PREFIX_HEADER_INCLUDE_PATH` can
|
||||
also be set on directories.
|
||||
|
||||
The following cache variables also affect the selection of prefix headers:
|
||||
|
||||
* Directory paths in `COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_PATH` will be added to the list of
|
||||
ignored directories when the prefix header file is created.
|
||||
|
||||
* `COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_EXTENSIONS` can be used to ignore header files by file
|
||||
extension. It defaults to the CMake list `inc;inl;ipp`.
|
||||
|
||||
During development, changes to the project source files may affect the list of header files that
|
||||
should be selected for inclusion in the prefix header (e.g., a standard include may be added or
|
||||
removed from a target source file). Cotire does not automatically recreate the prefix header,
|
||||
when a target source file is changed, because this would always trigger a re-compilation of the
|
||||
precompiled header and would result in a rebuild of the whole target. To make the prefix header
|
||||
creation dependent on changes to certain target source files, the source file property
|
||||
`COTIRE_DEPENDENCY` can be set to `TRUE` for those files:
|
||||
|
||||
set_property (SOURCE "example.cpp" PROPERTY COTIRE_DEPENDENCY "TRUE")
|
||||
|
||||
### fixing linkage issues
|
||||
|
||||
When a C++ program uses `extern "C"` on a system header file, cotire will not be able to detect
|
||||
that the include file needs C linkage and will include the file with C++ linkage in the generated
|
||||
prefix header instead. For example, the C interface to BLAS `cblas.h` usually has to be included
|
||||
as `extern "C"` in a C++ program:
|
||||
|
||||
extern "C" {
|
||||
#include <cblas.h>
|
||||
}
|
||||
|
||||
The presence of `extern "C"` includes will prevent cotired targets from being linked successfully
|
||||
because of unresolved function references using the wrong linkage. To work around the problem,
|
||||
the property `COTIRE_PREFIX_HEADER_IGNORE_PATH` can also include the full path of header files
|
||||
besides directories. Here is an example:
|
||||
|
||||
set_property(DIRECTORY
|
||||
PROPERTY COTIRE_PREFIX_HEADER_IGNORE_PATH
|
||||
"${ATLAS_INCLUDE_DIR}/cblas.h"
|
||||
"${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}")
|
||||
|
||||
That way `cblas.h` will not be included in the generated prefix header and will not cause problems
|
||||
upon linking.
|
||||
|
||||
### using a manually maintained unity source instead of the automatically generated one
|
||||
|
||||
Cotire can be configured to use an existing manually maintained unity source file instead of the
|
||||
automatically generated one. Set the target property `COTIRE_CXX_UNITY_SOURCE_INIT` to the path
|
||||
of the existing unity source file. Its path is interpreted relative to the target source directory:
|
||||
|
||||
set_target_properties(example PROPERTIES COTIRE_CXX_UNITY_SOURCE_INIT "example-all.cpp")
|
||||
cotire(example)
|
||||
|
||||
The property can also be set to a list of source files which will then make up the contents of
|
||||
the generated unity source file.
|
||||
|
||||
### configuring the generation of the unity source
|
||||
|
||||
By default cotire adds all target source files to the generated unity source. In most cases a
|
||||
unity build will not work out of the box, because unity builds [break][EoUB] the use of some C
|
||||
and C++ language features. Unity build problems can be tackled in the following way:
|
||||
|
||||
* Change the order of the source files in the `add_executable` or `add_library` calls.
|
||||
Problematic source files should be moved towards the end.
|
||||
|
||||
* Set the source file property `COTIRE_EXCLUDED` on problematic source files. The source file
|
||||
will not be included in the unity source file and will be compiled separately when the unity build
|
||||
is performed.
|
||||
|
||||
* `COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS` can be used to exclude source files by file extension
|
||||
from inclusion in the generated unity source. It defaults to the CMake list `m;mm`.
|
||||
|
||||
* If the unity source file is too large and the compilation process runs into a compiler limit,
|
||||
the target property `COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES` can be set. If the target
|
||||
contains more than that number of source files, cotire will create multiple unity source files
|
||||
for it. Each unity source file is compiled separately when the unity build is performed.
|
||||
The property is initialized by value of the cache variable
|
||||
`COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES`.
|
||||
|
||||
* Another way to break up a large unity source file is to set the source file property
|
||||
`COTIRE_START_NEW_UNITY_SOURCE` to `TRUE` on selected target source files. If cotire encounters
|
||||
this property, it will complete the current unity file and start a new one. The new unity source
|
||||
file will include the source file as the first one. This property essentially works as a separator
|
||||
for unity source files.
|
||||
|
||||
### optimizing the build process for multiple processor cores
|
||||
|
||||
To make use of all the machine's CPU cores for the unity compilation of a target, the target
|
||||
property `COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES` can be set to the string `-j`. Cotire
|
||||
will then create as many unity file segments as there are CPU cores on the machine. Because
|
||||
the unity file segments do not depend on each other, a multi-core aware build process can compile
|
||||
the file segments in parallel.
|
||||
|
||||
To explicitly specify the number of cores, append the number after `-j`, e.g. `-j 4` or `-j4`.
|
||||
|
||||
For CMake generators that are multi-core aware by default (i.e., Visual Studio, JOM, Ninja), cotire
|
||||
will automatically initialize the property to `-j`. For makefile based generators, this has to be
|
||||
done explicitly by setting the cache variable `COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES`, i.e.:
|
||||
|
||||
$ cmake -D COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES=-j4 <path-to-source>
|
||||
$ make -j 4
|
||||
|
||||
### fixing macro definition clashes
|
||||
|
||||
Many unity build problems stem from macro definitions leaking into other target source files,
|
||||
where they may conflict with other definitions of the same name. Cotire adds the properties
|
||||
`COTIRE_UNITY_SOURCE_PRE_UNDEFS` and `COTIRE_UNITY_SOURCE_POST_UNDEFS` to fix macro definition
|
||||
clashes.
|
||||
|
||||
As an example, if these properties are set on a source file of the example project:
|
||||
|
||||
set_source_files_properties (example.cpp PROPERTIES
|
||||
COTIRE_UNITY_SOURCE_PRE_UNDEFS "max;min"
|
||||
COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
|
||||
This will make cotire add undefs to the generated unity source file.
|
||||
|
||||
#ifdef __cplusplus
|
||||
#include "/Users/sakra/Documents/cotire/src/main.cpp"
|
||||
#undef min
|
||||
#undef max
|
||||
#include "/Users/sakra/Documents/cotire/src/example.cpp"
|
||||
#undef DEBUG_TYPE
|
||||
#include "/Users/sakra/Documents/cotire/src/log.cpp"
|
||||
#endif
|
||||
|
||||
The properties `COTIRE_UNITY_SOURCE_PRE_UNDEFS` and `COTIRE_UNITY_SOURCE_POST_UNDEFS` can also be
|
||||
set on targets. Cotire will add `#undef` directives for each source file in the unity source then.
|
||||
|
||||
### enabling verbose builds
|
||||
|
||||
The cache variable `COTIRE_VERBOSE` can be set to `TRUE` to see all compile commands used when
|
||||
generating the cotire related files. Cotire will also print the contents of the generated unity
|
||||
source and the prefix header for verbose builds. `COTIRE_VERBOSE` defaults to `FALSE`.
|
||||
When using a Makefile generator `COTIRE_VERBOSE` defaults to the value of the makefile variable
|
||||
`VERBOSE` (i.e., `make VERBOSE=1`).
|
||||
|
||||
### conditionally loading cotire
|
||||
|
||||
To make a `CMakeLists.txt` robust against a missing `cotire.cmake` module, the following strategy
|
||||
can be applied to using cotire:
|
||||
|
||||
include(cotire OPTIONAL)
|
||||
...
|
||||
add_executable(example main.cpp example.cpp log.cpp log.h example.h)
|
||||
...
|
||||
if (COMMAND cotire)
|
||||
cotire(example)
|
||||
endif()
|
||||
|
||||
The `include(cotire OPTIONAL)` will prevent CMake from raising an error if cotire cannot be
|
||||
found. The actual calls to cotire need to be guarded by `if (COMMAND cotire)` blocks.
|
||||
|
||||
### using cotire with compiler wrappers
|
||||
|
||||
Cotire is compatible with CMake compiler wrappers. For example, the use of [ccache][ccch] may be
|
||||
enabled in the following way upon configuring the project:
|
||||
|
||||
$ export CC="/usr/local/bin/ccache /usr/bin/gcc"
|
||||
$ export CXX="/usr/local/bin/ccache /usr/bin/g++"
|
||||
$ export CCACHE_SLOPPINESS=pch_defines,time_macros
|
||||
$ cmake ..
|
||||
|
||||
Alternatively, for CMake 3.4 or later compiler wrappers can be enabled by pointing the CMake
|
||||
variable `CMAKE_CXX_COMPILER_LAUNCHER` to the compiler wrapper executable upon configuring:
|
||||
|
||||
$ cmake -D CMAKE_CXX_COMPILER_LAUNCHER=/usr/local/bin/ccache <path-to-source>
|
||||
|
||||
Note that with ccache in order for precompiled headers to work properly, it is necessary to set
|
||||
the environment variable `CCACHE_SLOPPINESS` to `pch_defines,time_macros`. Otherwise the build
|
||||
process may abort with the following error message:
|
||||
|
||||
fatal error: file 'example_CXX_prefix.hxx' has been modified since the precompiled header
|
||||
'example_CXX_prefix.hxx.gch' was built
|
||||
|
||||
Also see the [ccache manual][ccch_pch].
|
||||
|
||||
### applying cotire to object library targets
|
||||
|
||||
CMake 2.8.8 introduced a new type of library target called [object library][objlib]. An object
|
||||
library is a convenience target that compiles multiple source files but does not create a linked
|
||||
target library for them, e.g.:
|
||||
|
||||
add_library(myLib OBJECT lib1.cpp lib2.cpp lib3.cpp)
|
||||
add_executable(exeA $<TARGET_OBJECTS:myLib> mainA.cpp)
|
||||
add_executable(exeB $<TARGET_OBJECTS:myLib> mainB.cpp)
|
||||
|
||||
The `cotire` function can be applied to an object library target in a familiar fashion:
|
||||
|
||||
add_library(myLib OBJECT lib1.cpp lib2.cpp lib3.cpp)
|
||||
cotire(myLib)
|
||||
# use unity object library for executables
|
||||
add_executable(exeA $<TARGET_OBJECTS:myLib_unity> mainA.cpp)
|
||||
add_executable(exeB $<TARGET_OBJECTS:myLib_unity> mainB.cpp)
|
||||
|
||||
Because object library targets do not support `PRE_BUILD` actions, precompiled header usage cannot
|
||||
be enabled for them for Xcode projects generated with CMake. Unity builds work as expected, though.
|
||||
|
||||
### automatically setting up linked libraries in the unity target
|
||||
|
||||
The setting of the target property `COTIRE_UNITY_LINK_LIBRARIES_INIT` controls the linking
|
||||
strategy for the generated unit target.
|
||||
|
||||
If this property is empty or set to `NONE`, the generated unity target's link libraries have to be
|
||||
set up manually with subsequent `target_link_libraries` calls:
|
||||
|
||||
set_target_properties(example PROPERTIES COTIRE_UNITY_LINK_LIBRARIES_INIT "NONE")
|
||||
...
|
||||
cotire(example)
|
||||
target_link_libraries(MyExecutable_unity ${MyExecutableLibraries})
|
||||
|
||||
If this property is set to `COPY`, the unity target's link libraries will be copied from the
|
||||
original target.
|
||||
|
||||
If this property is set to `COPY_UNITY`, the unity target's link libraries will be copied from the
|
||||
original target but instead of copying a linked target verbatim, the target's corresponding unity
|
||||
target will be preferred, provided one exists. This also applies to object libraries, which have
|
||||
been added to the original target with a `TARGET_OBJECTS` generator expression.
|
||||
|
||||
As of cotire 1.7.0, the default linking strategy for unit targets is `COPY_UNITY`.
|
||||
|
||||
The property `COTIRE_UNITY_LINK_LIBRARIES_INIT` can also be set on directories. A target inherits
|
||||
the property value from its enclosing directory. To make all targets in the project use the
|
||||
`COPY` strategy, the directory property can be set in the outermost `CMakeList.txt` file:
|
||||
|
||||
include(cotire)
|
||||
...
|
||||
set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY")
|
||||
|
||||
### using cotire with Qt
|
||||
|
||||
Cotire is compatible with both Qt4 and Qt5 projects that use CMake as build system.
|
||||
|
||||
If a CMake target's `AUTOMOC` or `AUTOUIC` properties are set, the generated unity target will
|
||||
automatically add a dependency to the implicitly generated `<targetname>_automoc` target to ensure
|
||||
that `moc` and `uic` are run on the individual source files.
|
||||
|
||||
The unity target will also include the implicitly generated `<targetname>_automoc.cpp` source file.
|
||||
|
||||
The `Patches` directory contains examples for the [Qt4][fsedit_qt4] and [Qt5][fsedit_qt5] based
|
||||
variants of the *FSEditor* sample Qt application.
|
||||
|
||||
### installing files generated by unity targets
|
||||
|
||||
Cotire cannot set up a `install_unity` target that mimics the `install` target automatically,
|
||||
because CMake does not provide the necessary information about the existing install rules
|
||||
programmatically.
|
||||
|
||||
When using a Makefile generator, you can use the following workaround (thanks to peterhuene):
|
||||
|
||||
$ make all_unity
|
||||
$ make install/fast
|
||||
|
||||
The `install/fast` does not trigger a build, but will use the binaries built by the `all_unity`
|
||||
target.
|
||||
|
||||
For other generators, set up an `install_unity` target manually. First set up install rules for
|
||||
all unity targets, that mimic the install rules for the original targets:
|
||||
|
||||
install(TARGETS example_unity RUNTIME DESTINATION "bin" OPTIONAL COMPONENT "unity")
|
||||
|
||||
This installs the `example` executable built by the unity target to the `bin` folder. The install
|
||||
rules for unity targets must use a custom install component. Then add a global `install_unity`
|
||||
target that performs the installation of all unity targets:
|
||||
|
||||
add_custom_target(install_unity
|
||||
COMMAND ${CMAKE_COMMAND} -DCOMPONENT=unity -P cmake_install.cmake
|
||||
COMMENT "Install the unity-built project..."
|
||||
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
|
||||
add_dependencies(unity_install example_unity)
|
||||
|
||||
The global `install_unity` target must depend on all unity targets that should be installed.
|
||||
|
||||
### customized inclusion of system headers
|
||||
|
||||
If a system header ends up in a precompiled header, it is not possible to customize the inclusion
|
||||
of that header in a source file through preprocessor defines.
|
||||
|
||||
For example, under Windows one may want to include `Windows.h` with `NOMINMAX` defined to prevent
|
||||
the definition of the `min` and `max` macros:
|
||||
|
||||
#define NOMINMAX
|
||||
#include <Windows.h>
|
||||
|
||||
The dependency of `Windows.h` on the preprocessor define `NOMINMAX` will not be picked up by cotire
|
||||
automatically upon adding `Windows.h` to the prefix header. To work around the problem, make the
|
||||
dependency explicit by using `add_definitions` in the corresponding `CMakeLists.txt`:
|
||||
|
||||
if (WIN32)
|
||||
# prevent definition of min and max macros through inclusion of Windows.h
|
||||
add_definitions("-DNOMINMAX")
|
||||
endif()
|
||||
|
||||
That way, the preprocessor define `NOMINMAX` will be picked up by cotire and applied to the
|
||||
pre-compilation of the prefix header.
|
||||
|
||||
### organize includes added to the prefix header
|
||||
|
||||
Sometimes the order of the includes in the automatically generated prefix header may result in
|
||||
compilation errors due to subtile header dependencies.
|
||||
|
||||
To work around the problem, the target property `COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH`
|
||||
can be set to a list of directories. Header files whose path matches one of these directories will
|
||||
be inserted at the beginning of generated prefix header. Header files are sorted according to
|
||||
the order of the directories in the property. Headers not matching one of these directories are
|
||||
left untouched.
|
||||
|
||||
The property `COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH` can also be set on directories. A target
|
||||
inherits the property value from its enclosing directory.
|
||||
|
||||
common pitfalls
|
||||
---------------
|
||||
|
||||
### include the `cotire.cmake` module correctly
|
||||
|
||||
If CMake issues the message `Unknown CMake command "cotire"`, double check that the cotire module
|
||||
has been included correctly in your project. See the manual section "cotire basic usage".
|
||||
|
||||
### do not modify a target's build related properties after applying cotire
|
||||
|
||||
Cotire only considers build related settings of a target at the time of the `cotire` function call.
|
||||
If target properties that control the build are changed after the call to the `cotire` function,
|
||||
the build rules set up by cotire for the precompiled header and unity build may not work correctly.
|
||||
|
||||
Don't do this:
|
||||
|
||||
add_executable(example main.cpp example.cpp log.cpp log.h example.h)
|
||||
cotire(example)
|
||||
...
|
||||
set_target_properties(example PROPERTIES POSITION_INDEPENDENT_CODE ON) # affects build
|
||||
|
||||
|
||||
### always apply cotire in the same source directory where a target has been added
|
||||
|
||||
CMake targets are globally visible. Nevertheless, it is important that the `cotire` function is
|
||||
called for a target in the exact same directory that creates the target with `add_library` or
|
||||
`add_executable`.
|
||||
|
||||
Don't do this:
|
||||
|
||||
add_subdirectory(src)
|
||||
...
|
||||
cotire(mytarget) # mytarget added in src directory
|
||||
|
||||
Cotire may fail to inspect the target's source files correctly, if the target has been added in a
|
||||
different directory and you may get odd messages about missing source files.
|
||||
|
||||
known issues
|
||||
------------
|
||||
|
||||
### Ninja compatibility
|
||||
|
||||
Under Ninja indirect prefix header dependencies are ignored by the generated build system. Cotire
|
||||
uses the `IMPLICIT_DEPENDS` option of `add_custom_command` to make the precompiled header depend
|
||||
on header files indirectly included by the prefix header. The `IMPLICIT_DEPENDS` option is not
|
||||
supported by CMake's Ninja generator. See [CMake issue][ninja_issue].
|
||||
|
||||
### using source files for multiple targets
|
||||
|
||||
When the same set of source files is used for different targets (e.g., for producing a static
|
||||
and a shared library variant from the same sources), using a precompiled header may not work.
|
||||
Under certain circumstances, cotire cannot enable the precompiled header usage by changing the
|
||||
`COMPILE_FLAGS` property of the whole target, but must set the `COMPILE_FLAGS` properties of
|
||||
individual target source files instead. This will break the usage of the source file for multiple
|
||||
targets.
|
||||
|
||||
### multi-architecture builds under Mac OS X
|
||||
|
||||
Neither GCC nor Clang support the use of precompiled headers when performing a Mac OS X
|
||||
multi-architecture build (e.g., using option `-DCMAKE_OSX_ARCHITECTURES=i386;x86_64`).
|
||||
|
||||
### Objective-C
|
||||
|
||||
CMake targets that contain Objective-C or Objective-C++ source files cannot be cotired. Source
|
||||
files ending with .m and .mm are excluded by default through the initial default setting of
|
||||
`COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS`.
|
||||
|
||||
### Intel C++
|
||||
|
||||
Intel C++ support has only been tested with [Intel C++ Composer XE 2013 for Linux][icc_linux] and
|
||||
may not work with other platforms or versions.
|
||||
|
||||
The Intel compiler may issue incorrect warnings #672 (the command line options do not match those
|
||||
used when precompiled header was created) or #673 (the initial sequence of preprocessing directives
|
||||
is not compatible with those of precompiled header file) upon compilation of cotired targets.
|
||||
|
||||
### IncrediBuild
|
||||
|
||||
Cotire is not compatible with [Xoreax IncrediBuild][XGE].
|
||||
|
||||
[1260]:http://www.cmake.org/Bug/view.php?id=1260
|
||||
[ccch]:https://ccache.samba.org/
|
||||
[ccch_pch]:https://ccache.samba.org/manual.html#_precompiled_headers
|
||||
[clang_pch]:http://clang.llvm.org/docs/UsersManual.html#precompiled-headers
|
||||
[fsedit_qt4]:http://www.vikingsoft.eu/fseditor.html
|
||||
[fsedit_qt5]:https://github.com/joonhwan/fsedit-qt5
|
||||
[gcc_pch]:https://gcc.gnu.org/onlinedocs/gcc/Precompiled-Headers.html
|
||||
[msvc_pch]:https://msdn.microsoft.com/en-us/library/szfdksca(v=vs.90).aspx
|
||||
[msvc_pch_create]:https://msdn.microsoft.com/en-us/library/7zc28563(v=vs.90).aspx
|
||||
[msvc_pch_use]:https://msdn.microsoft.com/en-us/library/z0atkd6c(v=vs.90).aspx
|
||||
[ninja_issue]:https://cmake.org/Bug/view.php?id=13234
|
||||
[EoUB]:https://engineering-game-dev.com/2009/12/15/the-evils-of-unity-builds/
|
||||
[pch]:https://en.wikipedia.org/wiki/Precompiled_header
|
||||
[scu]:https://en.wikipedia.org/wiki/Single_Compilation_Unit
|
||||
[objlib]:https://cmake.org/cmake/help/v2.8.12/cmake.html#command:add_library
|
||||
[pfh]:https://en.wikipedia.org/wiki/Prefix_header
|
||||
[icc_linux]:https://software.intel.com/en-us/c-compilers/ipsxe-support
|
||||
[XGE]:https://www.incredibuild.com/
|
||||
|
|
@ -0,0 +1,299 @@
|
|||
diff -rupN OpenCV-2.3.1/3rdparty/libjasper/CMakeLists.txt OpenCV-2.3.1.cotire/3rdparty/libjasper/CMakeLists.txt
|
||||
--- OpenCV-2.3.1/3rdparty/libjasper/CMakeLists.txt 2011-09-12 20:39:55.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/3rdparty/libjasper/CMakeLists.txt 2012-04-01 11:23:04.000000000 +0200
|
||||
@@ -56,3 +56,7 @@ if(NOT BUILD_SHARED_LIBS)
|
||||
install(TARGETS ${the_target}
|
||||
ARCHIVE DESTINATION share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
|
||||
endif()
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${the_target})
|
||||
+endif()
|
||||
diff -rupN OpenCV-2.3.1/3rdparty/libjpeg/CMakeLists.txt OpenCV-2.3.1.cotire/3rdparty/libjpeg/CMakeLists.txt
|
||||
--- OpenCV-2.3.1/3rdparty/libjpeg/CMakeLists.txt 2011-09-12 20:40:15.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/3rdparty/libjpeg/CMakeLists.txt 2012-04-01 11:23:10.000000000 +0200
|
||||
@@ -48,3 +48,7 @@ if(NOT BUILD_SHARED_LIBS)
|
||||
install(TARGETS ${the_target}
|
||||
ARCHIVE DESTINATION share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
|
||||
endif()
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${the_target})
|
||||
+endif()
|
||||
diff -rupN OpenCV-2.3.1/3rdparty/libpng/CMakeLists.txt OpenCV-2.3.1.cotire/3rdparty/libpng/CMakeLists.txt
|
||||
--- OpenCV-2.3.1/3rdparty/libpng/CMakeLists.txt 2011-09-12 20:40:02.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/3rdparty/libpng/CMakeLists.txt 2012-04-01 11:23:17.000000000 +0200
|
||||
@@ -49,3 +49,7 @@ if(NOT BUILD_SHARED_LIBS)
|
||||
install(TARGETS ${the_target}
|
||||
ARCHIVE DESTINATION share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
|
||||
endif()
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${the_target})
|
||||
+endif()
|
||||
diff -rupN OpenCV-2.3.1/3rdparty/libtiff/CMakeLists.txt OpenCV-2.3.1.cotire/3rdparty/libtiff/CMakeLists.txt
|
||||
--- OpenCV-2.3.1/3rdparty/libtiff/CMakeLists.txt 2011-09-12 20:29:15.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/3rdparty/libtiff/CMakeLists.txt 2012-04-01 11:23:23.000000000 +0200
|
||||
@@ -103,3 +103,7 @@ if(NOT BUILD_SHARED_LIBS)
|
||||
install(TARGETS ${the_target}
|
||||
ARCHIVE DESTINATION share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
|
||||
endif()
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${the_target})
|
||||
+endif()
|
||||
diff -rupN OpenCV-2.3.1/3rdparty/zlib/CMakeLists.txt OpenCV-2.3.1.cotire/3rdparty/zlib/CMakeLists.txt
|
||||
--- OpenCV-2.3.1/3rdparty/zlib/CMakeLists.txt 2011-09-12 20:29:21.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/3rdparty/zlib/CMakeLists.txt 2012-04-01 11:24:36.000000000 +0200
|
||||
@@ -40,3 +40,7 @@ if(NOT BUILD_SHARED_LIBS)
|
||||
install(TARGETS ${the_target}
|
||||
ARCHIVE DESTINATION share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
|
||||
endif()
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${the_target})
|
||||
+endif()
|
||||
diff -rupN OpenCV-2.3.1/CMakeLists.txt OpenCV-2.3.1.cotire/CMakeLists.txt
|
||||
--- OpenCV-2.3.1/CMakeLists.txt 2011-09-12 20:45:38.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/CMakeLists.txt 2012-04-01 14:34:56.000000000 +0200
|
||||
@@ -39,6 +39,8 @@ endif(NOT CMAKE_TOOLCHAIN_FILE)
|
||||
cmake_minimum_required(VERSION 2.4)
|
||||
project(OpenCV)
|
||||
|
||||
+include("${CMAKE_SOURCE_DIR}/cotire.cmake")
|
||||
+
|
||||
set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)
|
||||
if(DEFINED CMAKE_BUILD_TYPE)
|
||||
set_property( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES} )
|
||||
diff -rupN OpenCV-2.3.1/OpenCVModule.cmake OpenCV-2.3.1.cotire/OpenCVModule.cmake
|
||||
--- OpenCV-2.3.1/OpenCVModule.cmake 2011-09-12 20:45:38.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/OpenCVModule.cmake 2012-04-01 11:26:16.000000000 +0200
|
||||
@@ -86,7 +86,7 @@ macro(define_opencv_module name)
|
||||
INSTALL_NAME_DIR lib
|
||||
)
|
||||
|
||||
- add_opencv_precompiled_headers(${the_target})
|
||||
+# add_opencv_precompiled_headers(${the_target})
|
||||
|
||||
# Add the required libraries for linking:
|
||||
target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${IPP_LIBS} ${ARGN})
|
||||
@@ -102,6 +102,10 @@ macro(define_opencv_module name)
|
||||
)
|
||||
endif()
|
||||
|
||||
+ if (COMMAND cotire)
|
||||
+ cotire(${the_target})
|
||||
+ endif()
|
||||
+
|
||||
# Dependencies of this target:
|
||||
add_dependencies(${the_target} ${ARGN})
|
||||
|
||||
@@ -137,7 +141,7 @@ macro(define_opencv_module name)
|
||||
|
||||
add_executable(${the_target} ${test_srcs} ${test_hdrs})
|
||||
|
||||
- add_opencv_precompiled_headers(${the_target})
|
||||
+# add_opencv_precompiled_headers(${the_target})
|
||||
|
||||
# Additional target properties
|
||||
set_target_properties(${the_target} PROPERTIES
|
||||
@@ -149,6 +153,10 @@ macro(define_opencv_module name)
|
||||
set_target_properties(${the_target} PROPERTIES FOLDER "tests")
|
||||
endif()
|
||||
|
||||
+ if (COMMAND cotire)
|
||||
+ cotire(${the_target})
|
||||
+ endif()
|
||||
+
|
||||
add_dependencies(${the_target} ${test_deps})
|
||||
|
||||
# Add the required libraries for linking:
|
||||
diff -rupN OpenCV-2.3.1/modules/androidcamera/CMakeLists.txt OpenCV-2.3.1.cotire/modules/androidcamera/CMakeLists.txt
|
||||
--- OpenCV-2.3.1/modules/androidcamera/CMakeLists.txt 2011-09-12 20:42:03.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/modules/androidcamera/CMakeLists.txt 2012-04-01 11:28:54.000000000 +0200
|
||||
@@ -52,3 +52,7 @@ if (NOT BUILD_ANDROID_CAMERA_WRAPPER)
|
||||
COMPONENT main)
|
||||
endforeach()
|
||||
endif()
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${the_target})
|
||||
+endif()
|
||||
diff -rupN OpenCV-2.3.1/modules/androidcamera/camera_wrapper/CMakeLists.txt OpenCV-2.3.1.cotire/modules/androidcamera/camera_wrapper/CMakeLists.txt
|
||||
--- OpenCV-2.3.1/modules/androidcamera/camera_wrapper/CMakeLists.txt 2011-09-12 20:42:03.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/modules/androidcamera/camera_wrapper/CMakeLists.txt 2012-04-01 11:20:26.000000000 +0200
|
||||
@@ -34,3 +34,7 @@ SET_TARGET_PROPERTIES(${the_target} PROP
|
||||
)
|
||||
|
||||
install(TARGETS ${the_target} LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${the_target})
|
||||
+endif()
|
||||
diff -rupN OpenCV-2.3.1/modules/gpu/CMakeLists.txt OpenCV-2.3.1.cotire/modules/gpu/CMakeLists.txt
|
||||
--- OpenCV-2.3.1/modules/gpu/CMakeLists.txt 2011-09-12 20:42:20.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/modules/gpu/CMakeLists.txt 2012-04-01 11:41:04.000000000 +0200
|
||||
@@ -106,7 +106,7 @@ if (BUILD_SHARED_LIBS)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-add_opencv_precompiled_headers(${the_target})
|
||||
+#add_opencv_precompiled_headers(${the_target})
|
||||
|
||||
# Additional target properties
|
||||
set_target_properties(${the_target} PROPERTIES
|
||||
@@ -156,6 +156,9 @@ install(FILES src/nvidia/NPP_staging/NPP
|
||||
# DESTINATION ${OPENCV_INCLUDE_PREFIX}/opencv2/${name}/device
|
||||
# COMPONENT main)
|
||||
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${the_target})
|
||||
+endif()
|
||||
|
||||
################################################################################################################
|
||||
################################ GPU Module Tests #####################################################
|
||||
@@ -192,14 +195,17 @@ if(BUILD_TESTS AND EXISTS ${CMAKE_CURREN
|
||||
|
||||
add_executable(${the_test_target} ${test_srcs} ${test_hdrs} ${nvidia})
|
||||
|
||||
- add_opencv_precompiled_headers(${the_test_target})
|
||||
+# add_opencv_precompiled_headers(${the_test_target})
|
||||
|
||||
# Additional target properties
|
||||
set_target_properties(${the_test_target} PROPERTIES
|
||||
DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}"
|
||||
RUNTIME_OUTPUT_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}"
|
||||
)
|
||||
-
|
||||
+ if (COMMAND cotire)
|
||||
+ cotire(${the_test_target})
|
||||
+ endif()
|
||||
+
|
||||
if(ENABLE_SOLUTION_FOLDERS)
|
||||
set_target_properties(${the_test_target} PROPERTIES FOLDER "tests")
|
||||
endif()
|
||||
diff -rupN OpenCV-2.3.1/modules/haartraining/CMakeLists.txt OpenCV-2.3.1.cotire/modules/haartraining/CMakeLists.txt
|
||||
--- OpenCV-2.3.1/modules/haartraining/CMakeLists.txt 2011-09-12 20:43:56.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/modules/haartraining/CMakeLists.txt 2012-04-01 11:21:27.000000000 +0200
|
||||
@@ -45,6 +45,10 @@ set_target_properties(opencv_haartrainin
|
||||
INSTALL_NAME_DIR lib
|
||||
)
|
||||
|
||||
+if (COMMAND cotire)
|
||||
+cotire(opencv_haartraining_engine)
|
||||
+endif()
|
||||
+
|
||||
if(NOT ANDROID)
|
||||
# -----------------------------------------------------------
|
||||
# haartraining
|
||||
diff -rupN OpenCV-2.3.1/modules/highgui/CMakeLists.txt OpenCV-2.3.1.cotire/modules/highgui/CMakeLists.txt
|
||||
--- OpenCV-2.3.1/modules/highgui/CMakeLists.txt 2011-09-12 20:41:29.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/modules/highgui/CMakeLists.txt 2012-04-01 12:17:12.000000000 +0200
|
||||
@@ -77,6 +77,10 @@ file(GLOB grfmt_srcs src/grfmt*.cpp)
|
||||
set(grfmt_hdrs src/bitstrm.hpp ${grfmt_hdrs})
|
||||
set(grfmt_srcs src/bitstrm.cpp ${grfmt_srcs})
|
||||
|
||||
+if (COMMAND cotire)
|
||||
+ set_source_files_properties (${grfmt_srcs} PROPERTIES COTIRE_EXCLUDED TRUE)
|
||||
+endif()
|
||||
+
|
||||
source_group("Src\\grfmts" FILES ${grfmt_hdrs} ${grfmt_srcs})
|
||||
|
||||
set(highgui_srcs
|
||||
@@ -209,6 +213,9 @@ if(APPLE)
|
||||
else()
|
||||
set(highgui_srcs ${highgui_srcs} src/cap_qtkit.mm)
|
||||
endif()
|
||||
+ if (COMMAND cotire)
|
||||
+ set_source_files_properties (src/window_cocoa.mm src/cap_qtkit.mm PROPERTIES COTIRE_EXCLUDED TRUE)
|
||||
+ endif()
|
||||
endif(APPLE)
|
||||
|
||||
if(WITH_ANDROID_CAMERA)
|
||||
@@ -276,7 +283,7 @@ if (BUILD_SHARED_LIBS)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
-add_opencv_precompiled_headers(${the_target})
|
||||
+#add_opencv_precompiled_headers(${the_target})
|
||||
|
||||
# For dynamic link numbering convenions
|
||||
if(NOT ANDROID)
|
||||
@@ -307,6 +314,10 @@ if(MSVC)
|
||||
set_target_properties(${the_target} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /DEBUG")
|
||||
endif(MSVC)
|
||||
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${the_target})
|
||||
+endif()
|
||||
+
|
||||
# Dependencies of this target:
|
||||
add_dependencies(${the_target} opencv_core opencv_imgproc)
|
||||
|
||||
@@ -397,7 +408,7 @@ if(BUILD_TESTS)
|
||||
|
||||
add_executable(${the_target} ${test_srcs} ${test_hdrs})
|
||||
|
||||
- add_opencv_precompiled_headers(${the_target})
|
||||
+# add_opencv_precompiled_headers(${the_target})
|
||||
|
||||
# Additional target properties
|
||||
set_target_properties(${the_target} PROPERTIES
|
||||
@@ -409,6 +420,10 @@ if(BUILD_TESTS)
|
||||
set_target_properties(${the_target} PROPERTIES FOLDER "tests")
|
||||
endif()
|
||||
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${the_target})
|
||||
+endif()
|
||||
+
|
||||
add_dependencies(${the_target} ${test_deps})
|
||||
|
||||
# Add the required libraries for linking:
|
||||
diff -rupN OpenCV-2.3.1/modules/java/CMakeLists.txt OpenCV-2.3.1.cotire/modules/java/CMakeLists.txt
|
||||
--- OpenCV-2.3.1/modules/java/CMakeLists.txt 2011-09-12 20:40:26.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/modules/java/CMakeLists.txt 2012-04-01 11:22:49.000000000 +0200
|
||||
@@ -163,6 +163,10 @@ set_target_properties(${target} PROPERTI
|
||||
|
||||
install(TARGETS ${target} LIBRARY DESTINATION ${OPENCV_LIB_INSTALL_PATH} COMPONENT main)
|
||||
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${target})
|
||||
+endif()
|
||||
+
|
||||
if(ANDROID)
|
||||
target_link_libraries(${target} jnigraphics)
|
||||
|
||||
diff -rupN OpenCV-2.3.1/modules/python/CMakeLists.txt OpenCV-2.3.1.cotire/modules/python/CMakeLists.txt
|
||||
--- OpenCV-2.3.1/modules/python/CMakeLists.txt 2011-09-12 20:40:30.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/modules/python/CMakeLists.txt 2012-04-01 11:23:51.000000000 +0200
|
||||
@@ -92,3 +92,7 @@ install(TARGETS ${cvpymodules}
|
||||
ARCHIVE DESTINATION ${CVPY_PATH} COMPONENT main
|
||||
)
|
||||
install(FILES src2/cv.py DESTINATION ${CVPY_PATH} COMPONENT main)
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${cv2_target})
|
||||
+endif()
|
||||
diff -rupN OpenCV-2.3.1/modules/stitching/CMakeLists.txt OpenCV-2.3.1.cotire/modules/stitching/CMakeLists.txt
|
||||
--- OpenCV-2.3.1/modules/stitching/CMakeLists.txt 2011-09-12 20:42:22.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/modules/stitching/CMakeLists.txt 2012-04-01 11:24:09.000000000 +0200
|
||||
@@ -38,3 +38,7 @@ endif()
|
||||
target_link_libraries(${the_target} ${stitching_libs})
|
||||
|
||||
install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main)
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${the_target})
|
||||
+endif()
|
||||
diff -rupN OpenCV-2.3.1/modules/traincascade/CMakeLists.txt OpenCV-2.3.1.cotire/modules/traincascade/CMakeLists.txt
|
||||
--- OpenCV-2.3.1/modules/traincascade/CMakeLists.txt 2011-09-12 20:40:17.000000000 +0200
|
||||
+++ OpenCV-2.3.1.cotire/modules/traincascade/CMakeLists.txt 2012-04-01 11:24:25.000000000 +0200
|
||||
@@ -44,3 +44,7 @@ target_link_libraries(${the_target} ${tr
|
||||
if(NOT ANDROID)
|
||||
install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main)
|
||||
endif()
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${the_target})
|
||||
+endif()
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
This directory contains patch files to enable cotire for some popular open sources packages that
|
||||
use CMake as a build system.
|
||||
|
||||
For example, to apply Cotire to LLVM 3.0, first copy `cotire.cmake` to a directory on the CMake
|
||||
module search path (e.g., `llvm-3.0.src/cmake/modules`).
|
||||
|
||||
Then apply the corresponding patch:
|
||||
|
||||
$ cd /path/to/llvm-3.0.src
|
||||
$ patch -p1 < /path/to/llvm-3.0.src.patch
|
||||
|
||||
Then proceed with an out-of-source CMake build:
|
||||
|
||||
$ mkdir build; cd build
|
||||
$ cmake ..
|
||||
-- The C compiler identification is GNU 4.2.1
|
||||
-- The CXX compiler identification is Clang 3.1.0
|
||||
...
|
||||
$ make
|
||||
[ 0%] Generating C unity source lib/Support/cotire/LLVMSupport_C_unity.c
|
||||
[ 0%] Generating CXX unity source lib/Support/cotire/LLVMSupport_CXX_unity.cxx
|
||||
[ 0%] Generating CXX prefix header lib/Support/cotire/LLVMSupport_CXX_prefix.hxx
|
||||
[ 0%] Building CXX precompiled header lib/Support/cotire/LLVMSupport_CXX_prefix.hxx.gch
|
||||
...
|
||||
|
|
@ -0,0 +1,389 @@
|
|||
diff -rupN bullet-2.80-rev2531/CMakeLists.txt bullet-2.80-rev2531.cotire/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/CMakeLists.txt 2012-03-03 04:15:04.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/CMakeLists.txt 2012-03-24 20:40:40.000000000 +0100
|
||||
@@ -11,6 +11,7 @@ IF(COMMAND cmake_policy)
|
||||
cmake_policy(SET CMP0003 NEW)
|
||||
ENDIF(COMMAND cmake_policy)
|
||||
|
||||
+include("${CMAKE_SOURCE_DIR}/cotire.cmake")
|
||||
|
||||
IF (NOT CMAKE_BUILD_TYPE)
|
||||
# SET(CMAKE_BUILD_TYPE "Debug")
|
||||
diff -rupN bullet-2.80-rev2531/Demos/OpenGL/CMakeLists.txt bullet-2.80-rev2531.cotire/Demos/OpenGL/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/Demos/OpenGL/CMakeLists.txt 2011-09-13 03:52:42.000000000 +0200
|
||||
+++ bullet-2.80-rev2531.cotire/Demos/OpenGL/CMakeLists.txt 2012-03-24 20:35:19.000000000 +0100
|
||||
@@ -65,3 +65,7 @@ IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
ENDIF (INSTALL_EXTRA_LIBS)
|
||||
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(OpenGLSupport)
|
||||
+endif()
|
||||
diff -rupN bullet-2.80-rev2531/Extras/ConvexDecomposition/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/ConvexDecomposition/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/Extras/ConvexDecomposition/CMakeLists.txt 2010-09-18 02:24:50.000000000 +0200
|
||||
+++ bullet-2.80-rev2531.cotire/Extras/ConvexDecomposition/CMakeLists.txt 2012-03-24 20:35:36.000000000 +0100
|
||||
@@ -62,3 +62,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
ENDIF (INSTALL_EXTRA_LIBS)
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(ConvexDecomposition)
|
||||
+endif()
|
||||
diff -rupN bullet-2.80-rev2531/Extras/GIMPACTUtils/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/GIMPACTUtils/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/Extras/GIMPACTUtils/CMakeLists.txt 2010-09-18 02:24:50.000000000 +0200
|
||||
+++ bullet-2.80-rev2531.cotire/Extras/GIMPACTUtils/CMakeLists.txt 2012-03-24 20:35:42.000000000 +0100
|
||||
@@ -35,3 +35,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
ENDIF (INSTALL_EXTRA_LIBS)
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(GIMPACTUtils)
|
||||
+endif()
|
||||
diff -rupN bullet-2.80-rev2531/Extras/HACD/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/HACD/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/Extras/HACD/CMakeLists.txt 2011-07-07 02:28:15.000000000 +0200
|
||||
+++ bullet-2.80-rev2531.cotire/Extras/HACD/CMakeLists.txt 2012-03-24 20:36:03.000000000 +0100
|
||||
@@ -49,3 +49,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
|
||||
ENDIF (INSTALL_EXTRA_LIBS)
|
||||
|
||||
+
|
||||
|
||||
+if (COMMAND cotire)
|
||||
|
||||
+ cotire(HACD)
|
||||
|
||||
+endif()
|
||||
|
||||
diff -rupN bullet-2.80-rev2531/Extras/PhysicsEffects/src/base_level/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/PhysicsEffects/src/base_level/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/Extras/PhysicsEffects/src/base_level/CMakeLists.txt 2012-03-05 05:59:58.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/Extras/PhysicsEffects/src/base_level/CMakeLists.txt 2012-03-24 20:36:29.000000000 +0100
|
||||
@@ -75,3 +75,7 @@ ADD_LIBRARY(PfxBaseLevel ${PfxBaseLevel_
|
||||
|
||||
|
||||
SET_TARGET_PROPERTIES(PfxBaseLevel PROPERTIES VERSION ${BULLET_VERSION})
|
||||
|
||||
SET_TARGET_PROPERTIES(PfxBaseLevel PROPERTIES SOVERSION ${BULLET_VERSION})
|
||||
|
||||
+
|
||||
|
||||
+if (COMMAND cotire)
|
||||
|
||||
+ cotire(PfxBaseLevel)
|
||||
|
||||
+endif()
|
||||
|
||||
diff -rupN bullet-2.80-rev2531/Extras/PhysicsEffects/src/low_level/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/PhysicsEffects/src/low_level/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/Extras/PhysicsEffects/src/low_level/CMakeLists.txt 2012-03-05 05:59:58.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/Extras/PhysicsEffects/src/low_level/CMakeLists.txt 2012-03-24 20:36:39.000000000 +0100
|
||||
@@ -27,3 +27,7 @@ ADD_LIBRARY(PfxLowLevel ${PfxLowLevel_SR
|
||||
|
||||
|
||||
SET_TARGET_PROPERTIES(PfxLowLevel PROPERTIES VERSION ${BULLET_VERSION})
|
||||
|
||||
SET_TARGET_PROPERTIES(PfxLowLevel PROPERTIES SOVERSION ${BULLET_VERSION})
|
||||
|
||||
+
|
||||
|
||||
+if (COMMAND cotire)
|
||||
|
||||
+ cotire(PfxLowLevel)
|
||||
|
||||
+endif()
|
||||
|
||||
diff -rupN bullet-2.80-rev2531/Extras/PhysicsEffects/src/util/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/PhysicsEffects/src/util/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/Extras/PhysicsEffects/src/util/CMakeLists.txt 2012-03-05 05:59:58.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/Extras/PhysicsEffects/src/util/CMakeLists.txt 2012-03-24 20:36:47.000000000 +0100
|
||||
@@ -18,3 +18,7 @@ ADD_LIBRARY(PfxUtil ${PfxUtil_SRCS} ${Pf
|
||||
|
||||
|
||||
SET_TARGET_PROPERTIES(PfxUtil PROPERTIES VERSION ${BULLET_VERSION})
|
||||
|
||||
SET_TARGET_PROPERTIES(PfxUtil PROPERTIES SOVERSION ${BULLET_VERSION})
|
||||
|
||||
+
|
||||
|
||||
+if (COMMAND cotire)
|
||||
|
||||
+ cotire(PfxUtil)
|
||||
|
||||
+endif()
|
||||
|
||||
diff -rupN bullet-2.80-rev2531/Extras/Serialize/BlenderSerialize/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/Serialize/BlenderSerialize/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/Extras/Serialize/BlenderSerialize/CMakeLists.txt 2010-03-06 16:23:36.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/Extras/Serialize/BlenderSerialize/CMakeLists.txt 2012-03-24 20:36:55.000000000 +0100
|
||||
@@ -5,3 +5,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Seri
|
||||
)
|
||||
|
||||
ADD_LIBRARY(BlenderSerialize dna249.cpp dna249-64bit.cpp bBlenderFile.cpp bBlenderFile.h bMain.cpp bMain.h )
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(BlenderSerialize)
|
||||
+endif()
|
||||
diff -rupN bullet-2.80-rev2531/Extras/Serialize/BulletFileLoader/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/Serialize/BulletFileLoader/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/Extras/Serialize/BulletFileLoader/CMakeLists.txt 2012-02-29 05:43:51.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/Extras/Serialize/BulletFileLoader/CMakeLists.txt 2012-03-24 20:37:05.000000000 +0100
|
||||
@@ -47,3 +47,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
ENDIF (INSTALL_EXTRA_LIBS)
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(BulletFileLoader)
|
||||
+endif()
|
||||
diff -rupN bullet-2.80-rev2531/Extras/Serialize/BulletWorldImporter/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/Serialize/BulletWorldImporter/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/Extras/Serialize/BulletWorldImporter/CMakeLists.txt 2012-02-29 05:43:51.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/Extras/Serialize/BulletWorldImporter/CMakeLists.txt 2012-03-24 20:37:15.000000000 +0100
|
||||
@@ -36,3 +36,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
ENDIF (INSTALL_EXTRA_LIBS)
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(BulletWorldImporter)
|
||||
+endif()
|
||||
diff -rupN bullet-2.80-rev2531/Extras/Serialize/makesdna/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/Serialize/makesdna/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/Extras/Serialize/makesdna/CMakeLists.txt 2010-03-06 16:23:36.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/Extras/Serialize/makesdna/CMakeLists.txt 2012-03-24 20:37:26.000000000 +0100
|
||||
@@ -35,3 +35,7 @@ SET(SRC ${BULLET_PHYSICS_SOURCE_DIR}/sr
|
||||
ADD_LIBRARY(BulletDNA ${SRC} ${INC_FILES})
|
||||
|
||||
MESSAGE(STATUS "Configuring makesdna")
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(BulletDNA)
|
||||
+endif()
|
||||
diff -rupN bullet-2.80-rev2531/Extras/glui/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/glui/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/Extras/glui/CMakeLists.txt 2010-03-06 16:23:36.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/Extras/glui/CMakeLists.txt 2012-03-24 20:35:51.000000000 +0100
|
||||
@@ -64,3 +64,7 @@ arcball.cpp glui_button.cpp glui_fil
|
||||
IF (BUILD_SHARED_LIBS)
|
||||
TARGET_LINK_LIBRARIES(GLUI ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
|
||||
ENDIF (BUILD_SHARED_LIBS)
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(GLUI)
|
||||
+endif()
|
||||
diff -rupN bullet-2.80-rev2531/Extras/iff/CMakeLists.txt bullet-2.80-rev2531.cotire/Extras/iff/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/Extras/iff/CMakeLists.txt 2010-03-06 16:23:36.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/Extras/iff/CMakeLists.txt 2012-03-24 20:36:12.000000000 +0100
|
||||
@@ -9,3 +9,7 @@ iffw.cpp
|
||||
)
|
||||
|
||||
#SUBDIRS( BulletIffConverter )
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(Iff)
|
||||
+endif()
|
||||
diff -rupN bullet-2.80-rev2531/UnitTests/cppunit/CMakeLists.txt bullet-2.80-rev2531.cotire/UnitTests/cppunit/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/UnitTests/cppunit/CMakeLists.txt 2010-07-24 00:09:57.000000000 +0200
|
||||
+++ bullet-2.80-rev2531.cotire/UnitTests/cppunit/CMakeLists.txt 2012-03-24 20:39:51.000000000 +0100
|
||||
@@ -71,4 +71,8 @@ ADD_LIBRARY(cppunit
|
||||
|
||||
src/cppunit/XmlDocument.cpp
|
||||
|
||||
src/cppunit/XmlElement.cpp
|
||||
|
||||
|
||||
|
||||
-)
|
||||
\ No newline at end of file
|
||||
+)
|
||||
|
||||
+
|
||||
|
||||
+if (COMMAND cotire)
|
||||
|
||||
+ cotire(cppunit)
|
||||
|
||||
+endif()
|
||||
|
||||
diff -rupN bullet-2.80-rev2531/src/BulletCollision/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletCollision/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/src/BulletCollision/CMakeLists.txt 2012-02-29 06:19:22.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/src/BulletCollision/CMakeLists.txt 2012-03-24 20:37:38.000000000 +0100
|
||||
@@ -277,3 +277,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/Bulle
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
ENDIF (INSTALL_LIBS)
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(BulletCollision)
|
||||
+endif()
|
||||
diff -rupN bullet-2.80-rev2531/src/BulletDynamics/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletDynamics/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/src/BulletDynamics/CMakeLists.txt 2011-09-15 20:47:13.000000000 +0200
|
||||
+++ bullet-2.80-rev2531.cotire/src/BulletDynamics/CMakeLists.txt 2012-03-24 20:43:34.000000000 +0100
|
||||
@@ -110,3 +110,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/Bulle
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
ENDIF (INSTALL_LIBS)
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(BulletDynamics)
|
||||
+endif()
|
||||
diff -rupN bullet-2.80-rev2531/src/BulletMultiThreaded/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/src/BulletMultiThreaded/CMakeLists.txt 2012-02-29 06:19:22.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/CMakeLists.txt 2012-03-24 20:37:58.000000000 +0100
|
||||
@@ -121,3 +121,6 @@ PATTERN "*.h" PATTERN ".svn" EXCLUDE PA
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
ENDIF (INSTALL_LIBS)
|
||||
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(BulletMultiThreaded)
|
||||
+endif()
|
||||
diff -rupN bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/CMakeLists.txt 2011-11-11 20:00:26.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/DX11/CMakeLists.txt 2012-03-24 20:38:09.000000000 +0100
|
||||
@@ -81,3 +81,7 @@ IF (INSTALL_LIBS)
|
||||
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
|
||||
ENDIF (INSTALL_LIBS)
|
||||
|
||||
+
|
||||
|
||||
+if (COMMAND cotire)
|
||||
|
||||
+ cotire(BulletSoftBodySolvers_DX11)
|
||||
|
||||
+endif()
|
||||
|
||||
diff -rupN bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt 2011-12-20 19:03:24.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt 2012-03-24 20:38:22.000000000 +0100
|
||||
@@ -60,3 +60,7 @@ IF (INSTALL_LIBS)
|
||||
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
|
||||
ENDIF (INSTALL_LIBS)
|
||||
|
||||
+
|
||||
|
||||
+if (COMMAND cotire)
|
||||
|
||||
+ cotire(BulletSoftBodySolvers_OpenCL_AMD)
|
||||
|
||||
+endif()
|
||||
|
||||
diff -rupN bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt 2011-11-11 20:00:26.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/CMakeLists.txt 2012-03-24 20:38:38.000000000 +0100
|
||||
@@ -75,3 +75,7 @@ IF (INSTALL_LIBS)
|
||||
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
|
||||
ENDIF (INSTALL_LIBS)
|
||||
|
||||
+
|
||||
|
||||
+if (COMMAND cotire)
|
||||
|
||||
+ cotire(BulletSoftBodySolvers_OpenCL_Apple)
|
||||
|
||||
+endif()
|
||||
|
||||
diff -rupN bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/CMakeLists.txt 2011-12-20 19:03:24.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/CMakeLists.txt 2012-03-24 20:38:51.000000000 +0100
|
||||
@@ -80,3 +80,7 @@ IF (INSTALL_LIBS)
|
||||
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
|
||||
ENDIF (INSTALL_LIBS)
|
||||
|
||||
+
|
||||
|
||||
+if (COMMAND cotire)
|
||||
|
||||
+ cotire(BulletSoftBodySolvers_OpenCL_Intel)
|
||||
|
||||
+endif()
|
||||
|
||||
diff -rupN bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt 2011-11-11 20:00:26.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt 2012-03-24 20:39:00.000000000 +0100
|
||||
@@ -73,3 +73,7 @@ IF (INSTALL_LIBS)
|
||||
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
|
||||
ENDIF (INSTALL_LIBS)
|
||||
|
||||
+
|
||||
|
||||
+if (COMMAND cotire)
|
||||
|
||||
+ cotire(BulletSoftBodySolvers_OpenCL_Mini)
|
||||
|
||||
+endif()
|
||||
|
||||
diff -rupN bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt 2011-12-20 19:03:24.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt 2012-03-24 20:39:08.000000000 +0100
|
||||
@@ -79,3 +79,7 @@ IF (INSTALL_LIBS)
|
||||
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
|
||||
ENDIF (INSTALL_LIBS)
|
||||
|
||||
+
|
||||
|
||||
+if (COMMAND cotire)
|
||||
|
||||
+ cotire(BulletSoftBodySolvers_OpenCL_NVidia)
|
||||
|
||||
+endif()
|
||||
|
||||
diff -rupN bullet-2.80-rev2531/src/BulletSoftBody/CMakeLists.txt bullet-2.80-rev2531.cotire/src/BulletSoftBody/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/src/BulletSoftBody/CMakeLists.txt 2010-12-01 06:55:08.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/src/BulletSoftBody/CMakeLists.txt 2012-03-24 20:39:20.000000000 +0100
|
||||
@@ -63,3 +63,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
ENDIF (INSTALL_LIBS)
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(BulletSoftBody)
|
||||
+endif()
|
||||
diff -rupN bullet-2.80-rev2531/src/LinearMath/CMakeLists.txt bullet-2.80-rev2531.cotire/src/LinearMath/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/src/LinearMath/CMakeLists.txt 2011-11-11 21:11:03.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/src/LinearMath/CMakeLists.txt 2012-03-24 20:39:28.000000000 +0100
|
||||
@@ -64,3 +64,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES
|
||||
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
ENDIF (INSTALL_LIBS)
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(LinearMath)
|
||||
+endif()
|
||||
diff -rupN bullet-2.80-rev2531/src/MiniCL/CMakeLists.txt bullet-2.80-rev2531.cotire/src/MiniCL/CMakeLists.txt
|
||||
--- bullet-2.80-rev2531/src/MiniCL/CMakeLists.txt 2012-02-29 06:19:22.000000000 +0100
|
||||
+++ bullet-2.80-rev2531.cotire/src/MiniCL/CMakeLists.txt 2012-03-24 20:39:38.000000000 +0100
|
||||
@@ -64,3 +64,6 @@ PATTERN "*.h" PATTERN ".svn" EXCLUDE PA
|
||||
ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
|
||||
|
||||
ENDIF (INSTALL_LIBS)
|
||||
|
||||
|
||||
|
||||
+if (COMMAND cotire)
|
||||
|
||||
+ cotire(MiniCL)
|
||||
|
||||
+endif()
|
||||
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
diff -rupN clang-3.0.src/CMakeLists.txt clang-3.0.src.cotire/CMakeLists.txt
|
||||
--- clang-3.0.src/CMakeLists.txt 2011-10-06 15:03:08.000000000 +0200
|
||||
+++ clang-3.0.src.cotire/CMakeLists.txt 2012-03-24 14:04:10.000000000 +0100
|
||||
@@ -36,6 +36,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
|
||||
include(TableGen)
|
||||
include("${CLANG_PATH_TO_LLVM_BUILD}/share/llvm/cmake/LLVMConfig.cmake")
|
||||
include(HandleLLVMOptions)
|
||||
+ include(cotire)
|
||||
|
||||
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
|
||||
|
||||
@@ -206,6 +207,11 @@ macro(add_clang_library name)
|
||||
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
|
||||
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Clang libraries")
|
||||
+ if (COMMAND cotire)
|
||||
+ if (NOT "${name}" MATCHES "libclang")
|
||||
+ cotire(${name})
|
||||
+ endif()
|
||||
+ endif()
|
||||
endmacro(add_clang_library)
|
||||
|
||||
macro(add_clang_executable name)
|
||||
diff -rupN clang-3.0.src/tools/libclang/CMakeLists.txt clang-3.0.src.cotire/tools/libclang/CMakeLists.txt
|
||||
--- clang-3.0.src/tools/libclang/CMakeLists.txt 2011-10-06 09:00:54.000000000 +0200
|
||||
+++ clang-3.0.src.cotire/tools/libclang/CMakeLists.txt 2012-03-24 14:05:02.000000000 +0100
|
||||
@@ -70,3 +70,8 @@ if( NOT BUILD_SHARED_LIBS AND NOT WIN32
|
||||
PROPERTIES
|
||||
OUTPUT_NAME "libclang")
|
||||
endif()
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(libclang)
|
||||
+ cotire(${LIBCLANG_STATIC_TARGET_NAME})
|
||||
+endif()
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
diff -rupN clang-3.1.src/CMakeLists.txt clang-3.1.src.cotire/CMakeLists.txt
|
||||
--- clang-3.1.src/CMakeLists.txt 2012-04-16 06:16:43.000000000 +0200
|
||||
+++ clang-3.1.src.cotire/CMakeLists.txt 2012-05-23 19:34:06.000000000 +0200
|
||||
@@ -36,6 +36,7 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
|
||||
include(TableGen)
|
||||
include("${CLANG_PATH_TO_LLVM_BUILD}/share/llvm/cmake/LLVMConfig.cmake")
|
||||
include(HandleLLVMOptions)
|
||||
+ include(cotire)
|
||||
|
||||
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
|
||||
|
||||
@@ -211,6 +212,11 @@ macro(add_clang_library name)
|
||||
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
|
||||
RUNTIME DESTINATION bin)
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Clang libraries")
|
||||
+ if (COMMAND cotire)
|
||||
+ if (NOT "${name}" MATCHES "libclang")
|
||||
+ cotire(${name})
|
||||
+ endif()
|
||||
+ endif()
|
||||
endmacro(add_clang_library)
|
||||
|
||||
macro(add_clang_executable name)
|
||||
diff -rupN clang-3.1.src/tools/libclang/CMakeLists.txt clang-3.1.src.cotire/tools/libclang/CMakeLists.txt
|
||||
--- clang-3.1.src/tools/libclang/CMakeLists.txt 2012-04-13 19:26:32.000000000 +0200
|
||||
+++ clang-3.1.src.cotire/tools/libclang/CMakeLists.txt 2012-05-23 19:34:06.000000000 +0200
|
||||
@@ -88,3 +88,8 @@ if( NOT BUILD_SHARED_LIBS AND NOT WIN32
|
||||
PROPERTIES
|
||||
OUTPUT_NAME "libclang")
|
||||
endif()
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(libclang)
|
||||
+ cotire(${LIBCLANG_STATIC_TARGET_NAME})
|
||||
+endif()
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
diff -rupN cfe-3.3.src/CMakeLists.txt cfe-3.3.src.cotire/CMakeLists.txt
|
||||
--- cfe-3.3.src/CMakeLists.txt 2013-04-22 16:51:21.000000000 +0200
|
||||
+++ cfe-3.3.src.cotire/CMakeLists.txt 2013-10-13 12:02:05.000000000 +0200
|
||||
@@ -2,7 +2,7 @@
|
||||
# standalone project, using LLVM as an external library:
|
||||
if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
|
||||
project(Clang)
|
||||
- cmake_minimum_required(VERSION 2.8)
|
||||
+ cmake_minimum_required(VERSION 2.8.11)
|
||||
|
||||
set(CLANG_PATH_TO_LLVM_SOURCE "" CACHE PATH
|
||||
"Path to LLVM source code. Not necessary if using an installed LLVM.")
|
||||
@@ -36,6 +36,8 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
|
||||
include(TableGen)
|
||||
include("${CLANG_PATH_TO_LLVM_BUILD}/share/llvm/cmake/LLVMConfig.cmake")
|
||||
include(HandleLLVMOptions)
|
||||
+ include(cotire)
|
||||
+ set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY")
|
||||
|
||||
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
|
||||
|
||||
@@ -234,6 +236,12 @@ macro(add_clang_library name)
|
||||
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}
|
||||
RUNTIME DESTINATION bin)
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Clang libraries")
|
||||
+ if (COMMAND cotire)
|
||||
+ if (NOT "${name}" MATCHES "libclang")
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+ endif()
|
||||
+ endif()
|
||||
endmacro(add_clang_library)
|
||||
|
||||
macro(add_clang_executable name)
|
||||
diff -rupN cfe-3.3.src/tools/libclang/CMakeLists.txt cfe-3.3.src.cotire/tools/libclang/CMakeLists.txt
|
||||
--- cfe-3.3.src/tools/libclang/CMakeLists.txt 2013-03-29 22:51:40.000000000 +0100
|
||||
+++ cfe-3.3.src.cotire/tools/libclang/CMakeLists.txt 2013-10-13 11:32:48.000000000 +0200
|
||||
@@ -114,3 +114,8 @@ if( NOT BUILD_SHARED_LIBS AND NOT WIN32
|
||||
PROPERTIES
|
||||
OUTPUT_NAME "clang")
|
||||
endif()
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(libclang)
|
||||
+ cotire(${LIBCLANG_STATIC_TARGET_NAME})
|
||||
+endif()
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
diff -rupN clang-3.4.src/CMakeLists.txt clang-3.4.src.cotire/CMakeLists.txt
|
||||
--- clang-3.4.src/CMakeLists.txt 2013-11-06 09:37:50.000000000 +0100
|
||||
+++ clang-3.4.src.cotire/CMakeLists.txt 2014-01-17 20:33:42.000000000 +0100
|
||||
@@ -2,7 +2,7 @@
|
||||
# standalone project, using LLVM as an external library:
|
||||
if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
|
||||
project(Clang)
|
||||
- cmake_minimum_required(VERSION 2.8)
|
||||
+ cmake_minimum_required(VERSION 2.8.11)
|
||||
|
||||
set(CLANG_PATH_TO_LLVM_SOURCE "" CACHE PATH
|
||||
"Path to LLVM source code. Not necessary if using an installed LLVM.")
|
||||
@@ -40,6 +40,8 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
|
||||
include(TableGen)
|
||||
include("${CLANG_PATH_TO_LLVM_BUILD}/share/llvm/cmake/LLVMConfig.cmake")
|
||||
include(HandleLLVMOptions)
|
||||
+ include(cotire)
|
||||
+ set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY")
|
||||
|
||||
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
|
||||
|
||||
@@ -286,6 +288,12 @@ macro(add_clang_library name)
|
||||
endif()
|
||||
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Clang libraries")
|
||||
+ if (COMMAND cotire)
|
||||
+ if (NOT "${name}" MATCHES "libclang")
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+ endif()
|
||||
+ endif()
|
||||
endmacro(add_clang_library)
|
||||
|
||||
macro(add_clang_executable name)
|
||||
diff -rupN clang-3.4.src/tools/libclang/CMakeLists.txt clang-3.4.src.cotire/tools/libclang/CMakeLists.txt
|
||||
--- clang-3.4.src/tools/libclang/CMakeLists.txt 2013-11-13 23:26:04.000000000 +0100
|
||||
+++ clang-3.4.src.cotire/tools/libclang/CMakeLists.txt 2014-01-17 20:37:53.000000000 +0100
|
||||
@@ -124,3 +124,10 @@ if( (NOT LLVM_ENABLE_PIC OR LIBCLANG_BUI
|
||||
PROPERTIES
|
||||
OUTPUT_NAME "clang")
|
||||
endif()
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(libclang)
|
||||
+ if (TARGET ${LIBCLANG_STATIC_TARGET_NAME})
|
||||
+ cotire(${LIBCLANG_STATIC_TARGET_NAME})
|
||||
+ endif()
|
||||
+endif()
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
diff -rupN --exclude=.DS_Store cfe-3.5.0.src/CMakeLists.txt cfe-3.5.0.src.cotire/CMakeLists.txt
|
||||
--- cfe-3.5.0.src/CMakeLists.txt 2014-07-16 18:48:33.000000000 +0200
|
||||
+++ cfe-3.5.0.src.cotire/CMakeLists.txt 2014-12-21 19:58:36.000000000 +0100
|
||||
@@ -94,6 +94,8 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
|
||||
include(AddLLVM)
|
||||
include(TableGen)
|
||||
include(HandleLLVMOptions)
|
||||
+ include(cotire)
|
||||
+ set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY")
|
||||
|
||||
set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
|
||||
|
||||
@@ -343,6 +345,12 @@ macro(add_clang_library name)
|
||||
endif()
|
||||
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Clang libraries")
|
||||
+ if (COMMAND cotire)
|
||||
+ if (NOT "${name}" MATCHES "libclang")
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+ endif()
|
||||
+ endif()
|
||||
endmacro(add_clang_library)
|
||||
|
||||
macro(add_clang_executable name)
|
||||
diff -rupN --exclude=.DS_Store cfe-3.5.0.src/tools/libclang/CMakeLists.txt cfe-3.5.0.src.cotire/tools/libclang/CMakeLists.txt
|
||||
--- cfe-3.5.0.src/tools/libclang/CMakeLists.txt 2014-07-15 00:17:16.000000000 +0200
|
||||
+++ cfe-3.5.0.src.cotire/tools/libclang/CMakeLists.txt 2014-12-21 19:58:36.000000000 +0100
|
||||
@@ -114,3 +114,10 @@ if(ENABLE_SHARED)
|
||||
LINK_FLAGS ${LIBCLANG_LINK_FLAGS})
|
||||
endif()
|
||||
endif()
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(libclang)
|
||||
+ if (TARGET ${LIBCLANG_STATIC_TARGET_NAME})
|
||||
+ cotire(${LIBCLANG_STATIC_TARGET_NAME})
|
||||
+ endif()
|
||||
+endif()
|
||||
|
|
@ -0,0 +1,93 @@
|
|||
diff -rupN clapack-3.2.1-CMAKE/BLAS/SRC/CMakeLists.txt clapack-3.2.1-CMAKE.cotire/BLAS/SRC/CMakeLists.txt
|
||||
--- clapack-3.2.1-CMAKE/BLAS/SRC/CMakeLists.txt 2009-08-14 22:16:25.000000000 +0200
|
||||
+++ clapack-3.2.1-CMAKE.cotire/BLAS/SRC/CMakeLists.txt 2012-03-24 19:59:26.000000000 +0100
|
||||
@@ -141,3 +141,13 @@ if(UNIX)
|
||||
target_link_libraries(blas m)
|
||||
endif()
|
||||
target_link_libraries(blas f2c)
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(blas)
|
||||
+ if (TARGET blas_unity)
|
||||
+ if(UNIX)
|
||||
+ target_link_libraries(blas_unity m)
|
||||
+ endif()
|
||||
+ target_link_libraries(blas_unity f2c_unity)
|
||||
+ endif()
|
||||
+endif()
|
||||
diff -rupN clapack-3.2.1-CMAKE/CMakeLists.txt clapack-3.2.1-CMAKE.cotire/CMakeLists.txt
|
||||
--- clapack-3.2.1-CMAKE/CMakeLists.txt 2009-08-10 20:46:33.000000000 +0200
|
||||
+++ clapack-3.2.1-CMAKE.cotire/CMakeLists.txt 2012-03-24 19:56:58.000000000 +0100
|
||||
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.6)
|
||||
project(CLAPACK C)
|
||||
enable_testing()
|
||||
include(CTest)
|
||||
+include("${CMAKE_SOURCE_DIR}/cotire.cmake")
|
||||
|
||||
if(WIN32 AND NOT CYGWIN)
|
||||
set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/winsecond.c)
|
||||
diff -rupN clapack-3.2.1-CMAKE/F2CLIBS/libf2c/CMakeLists.txt clapack-3.2.1-CMAKE.cotire/F2CLIBS/libf2c/CMakeLists.txt
|
||||
--- clapack-3.2.1-CMAKE/F2CLIBS/libf2c/CMakeLists.txt 2009-08-10 20:06:06.000000000 +0200
|
||||
+++ clapack-3.2.1-CMAKE.cotire/F2CLIBS/libf2c/CMakeLists.txt 2012-03-24 19:58:41.000000000 +0100
|
||||
@@ -60,3 +60,6 @@ include_directories(${CLAPACK_SOURCE_DIR
|
||||
include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c)
|
||||
add_library(f2c ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h)
|
||||
set_property(TARGET f2c PROPERTY PREFIX lib)
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(f2c)
|
||||
+endif()
|
||||
diff -rupN clapack-3.2.1-CMAKE/SRC/CMakeLists.txt clapack-3.2.1-CMAKE.cotire/SRC/CMakeLists.txt
|
||||
--- clapack-3.2.1-CMAKE/SRC/CMakeLists.txt 2009-08-10 19:47:54.000000000 +0200
|
||||
+++ clapack-3.2.1-CMAKE.cotire/SRC/CMakeLists.txt 2012-03-24 19:59:20.000000000 +0100
|
||||
@@ -378,3 +378,9 @@ endif()
|
||||
add_library(lapack ${ALLOBJ} ${ALLXOBJ})
|
||||
target_link_libraries(lapack blas)
|
||||
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(lapack)
|
||||
+ if (TARGET lapack_unity)
|
||||
+ target_link_libraries(lapack_unity blas_unity)
|
||||
+ endif()
|
||||
+endif()
|
||||
diff -rupN clapack-3.2.1-CMAKE/TESTING/EIG/CMakeLists.txt clapack-3.2.1-CMAKE.cotire/TESTING/EIG/CMakeLists.txt
|
||||
--- clapack-3.2.1-CMAKE/TESTING/EIG/CMakeLists.txt 2009-08-10 19:47:54.000000000 +0200
|
||||
+++ clapack-3.2.1-CMAKE.cotire/TESTING/EIG/CMakeLists.txt 2012-03-24 20:07:55.000000000 +0100
|
||||
@@ -120,6 +120,12 @@ set(ZEIGTST zchkee.c
|
||||
macro(add_eig_executable name )
|
||||
add_executable(${name} ${ARGN})
|
||||
target_link_libraries(${name} tmglib lapack )
|
||||
+ if (COMMAND cotire)
|
||||
+ cotire(${name})
|
||||
+ if (TARGET ${name}_unity)
|
||||
+ target_link_libraries(${name}_unity tmglib lapack )
|
||||
+ endif()
|
||||
+ endif()
|
||||
endmacro(add_eig_executable)
|
||||
|
||||
add_eig_executable(xeigtsts ${SEIGTST} ${SCIGTST} ${AEIGTST}
|
||||
diff -rupN clapack-3.2.1-CMAKE/TESTING/LIN/CMakeLists.txt clapack-3.2.1-CMAKE.cotire/TESTING/LIN/CMakeLists.txt
|
||||
--- clapack-3.2.1-CMAKE/TESTING/LIN/CMakeLists.txt 2009-08-10 20:06:06.000000000 +0200
|
||||
+++ clapack-3.2.1-CMAKE.cotire/TESTING/LIN/CMakeLists.txt 2012-03-24 20:08:13.000000000 +0100
|
||||
@@ -190,6 +190,12 @@ set(ZLINTSTRFP zchkrfp.c zdrvrfp.c zdrv
|
||||
macro(add_lin_executable name )
|
||||
add_executable(${name} ${ARGN})
|
||||
target_link_libraries(${name} tmglib lapack)
|
||||
+ if (COMMAND cotire)
|
||||
+ cotire(${name})
|
||||
+ if (TARGET ${name}_unity)
|
||||
+ target_link_libraries(${name}_unity tmglib lapack )
|
||||
+ endif()
|
||||
+ endif()
|
||||
endmacro(add_lin_executable)
|
||||
|
||||
add_lin_executable(xlintsts ${ALINTST} ${SCLNTST} ${SLINTST}
|
||||
diff -rupN clapack-3.2.1-CMAKE/TESTING/MATGEN/CMakeLists.txt clapack-3.2.1-CMAKE.cotire/TESTING/MATGEN/CMakeLists.txt
|
||||
--- clapack-3.2.1-CMAKE/TESTING/MATGEN/CMakeLists.txt 2009-08-10 19:47:54.000000000 +0200
|
||||
+++ clapack-3.2.1-CMAKE.cotire/TESTING/MATGEN/CMakeLists.txt 2012-03-24 20:05:19.000000000 +0100
|
||||
@@ -67,3 +67,6 @@ if(BUILD_COMPLEX16)
|
||||
endif()
|
||||
add_library(tmglib ${ALLOBJ} )
|
||||
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(tmglib)
|
||||
+endif()
|
||||
|
|
@ -0,0 +1,218 @@
|
|||
diff -rupN cmake-2.8.7/CMakeLists.txt cmake-2.8.7.cotire/CMakeLists.txt
|
||||
--- cmake-2.8.7/CMakeLists.txt 2011-12-30 17:49:56.000000000 +0100
|
||||
+++ cmake-2.8.7.cotire/CMakeLists.txt 2012-03-24 14:41:40.000000000 +0100
|
||||
@@ -13,6 +13,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FAT
|
||||
SET(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
|
||||
PROJECT(CMake)
|
||||
|
||||
+include(Modules/cotire.cmake)
|
||||
+
|
||||
IF(CMAKE_BOOTSTRAP)
|
||||
# Running from bootstrap script. Set local variable and remove from cache.
|
||||
SET(CMAKE_BOOTSTRAP 1)
|
||||
diff -rupN cmake-2.8.7/Source/CMakeLists.txt cmake-2.8.7.cotire/Source/CMakeLists.txt
|
||||
--- cmake-2.8.7/Source/CMakeLists.txt 2011-12-30 17:49:56.000000000 +0100
|
||||
+++ cmake-2.8.7.cotire/Source/CMakeLists.txt 2012-02-24 22:35:58.000000000 +0100
|
||||
@@ -364,6 +364,9 @@ TARGET_LINK_LIBRARIES(CMakeLib cmsys
|
||||
IF(APPLE)
|
||||
TARGET_LINK_LIBRARIES(CMakeLib "-framework CoreFoundation")
|
||||
ENDIF(APPLE)
|
||||
+if (COMMAND cotire)
|
||||
+cotire(CMakeLib)
|
||||
+endif()
|
||||
|
||||
# On some platforms we need the rpcrt4 library for the VS 7 generators.
|
||||
IF(CMAKE_BUILD_ON_VISUAL_STUDIO OR MINGW)
|
||||
@@ -433,6 +436,9 @@ SET(CTEST_SRCS cmCTest.cxx
|
||||
# Build CTestLib
|
||||
ADD_LIBRARY(CTestLib ${CTEST_SRCS})
|
||||
TARGET_LINK_LIBRARIES(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES} ${CMAKE_XMLRPC_LIBRARIES})
|
||||
+if (COMMAND cotire)
|
||||
+cotire(CTestLib)
|
||||
+endif()
|
||||
|
||||
#
|
||||
# Sources for CPack
|
||||
@@ -477,6 +483,9 @@ ENDIF(APPLE)
|
||||
# Build CPackLib
|
||||
ADD_LIBRARY(CPackLib ${CPACK_SRCS})
|
||||
TARGET_LINK_LIBRARIES(CPackLib CMakeLib)
|
||||
+if (COMMAND cotire)
|
||||
+cotire(CPackLib)
|
||||
+endif()
|
||||
|
||||
IF(APPLE)
|
||||
ADD_EXECUTABLE(cmakexbuild cmakexbuild.cxx)
|
||||
@@ -485,11 +494,17 @@ IF(APPLE)
|
||||
CPack/OSXScriptLauncher.cxx)
|
||||
TARGET_LINK_LIBRARIES(OSXScriptLauncher cmsys)
|
||||
TARGET_LINK_LIBRARIES(OSXScriptLauncher "-framework CoreFoundation")
|
||||
+if (COMMAND cotire)
|
||||
+cotire(cmakexbuild)
|
||||
+endif()
|
||||
ENDIF(APPLE)
|
||||
|
||||
# Build CMake executable
|
||||
ADD_EXECUTABLE(cmake cmakemain.cxx)
|
||||
TARGET_LINK_LIBRARIES(cmake CMakeLib)
|
||||
+if (COMMAND cotire)
|
||||
+cotire(cmake)
|
||||
+endif()
|
||||
|
||||
# Build special executable for running programs on Windows 98
|
||||
IF(WIN32)
|
||||
@@ -503,10 +518,16 @@ ENDIF(WIN32)
|
||||
# Build CTest executable
|
||||
ADD_EXECUTABLE(ctest ctest.cxx)
|
||||
TARGET_LINK_LIBRARIES(ctest CTestLib)
|
||||
+if (COMMAND cotire)
|
||||
+cotire(ctest)
|
||||
+endif()
|
||||
|
||||
# Build CPack executable
|
||||
ADD_EXECUTABLE(cpack CPack/cpack.cxx)
|
||||
TARGET_LINK_LIBRARIES(cpack CPackLib)
|
||||
+if (COMMAND cotire)
|
||||
+cotire(cpack)
|
||||
+endif()
|
||||
|
||||
# Curses GUI
|
||||
IF(BUILD_CursesDialog)
|
||||
diff -rupN cmake-2.8.7/Source/CursesDialog/CMakeLists.txt cmake-2.8.7.cotire/Source/CursesDialog/CMakeLists.txt
|
||||
--- cmake-2.8.7/Source/CursesDialog/CMakeLists.txt 2011-12-30 17:49:57.000000000 +0100
|
||||
+++ cmake-2.8.7.cotire/Source/CursesDialog/CMakeLists.txt 2012-02-22 20:41:03.000000000 +0100
|
||||
@@ -33,5 +33,7 @@ INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PAT
|
||||
ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
|
||||
TARGET_LINK_LIBRARIES(ccmake CMakeLib)
|
||||
TARGET_LINK_LIBRARIES(ccmake cmForm)
|
||||
-
|
||||
+if (COMMAND cotire)
|
||||
+cotire(ccmake)
|
||||
+endif()
|
||||
INSTALL_TARGETS(/bin ccmake)
|
||||
diff -rupN cmake-2.8.7/Source/CursesDialog/form/CMakeLists.txt cmake-2.8.7.cotire/Source/CursesDialog/form/CMakeLists.txt
|
||||
--- cmake-2.8.7/Source/CursesDialog/form/CMakeLists.txt 2011-12-30 17:49:57.000000000 +0100
|
||||
+++ cmake-2.8.7.cotire/Source/CursesDialog/form/CMakeLists.txt 2012-02-24 21:30:47.000000000 +0100
|
||||
@@ -64,3 +64,6 @@ TARGET_LINK_LIBRARIES(cmForm ${CURSES_LI
|
||||
IF(CURSES_EXTRA_LIBRARY)
|
||||
TARGET_LINK_LIBRARIES(cmForm ${CURSES_EXTRA_LIBRARY})
|
||||
ENDIF(CURSES_EXTRA_LIBRARY)
|
||||
+if (COMMAND cotire)
|
||||
+cotire(cmForm)
|
||||
+endif()
|
||||
diff -rupN cmake-2.8.7/Source/kwsys/CMakeLists.txt cmake-2.8.7.cotire/Source/kwsys/CMakeLists.txt
|
||||
--- cmake-2.8.7/Source/kwsys/CMakeLists.txt 2011-12-30 17:49:57.000000000 +0100
|
||||
+++ cmake-2.8.7.cotire/Source/kwsys/CMakeLists.txt 2012-03-24 15:03:17.000000000 +0100
|
||||
@@ -926,6 +926,9 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
|
||||
ADD_LIBRARY(${KWSYS_NAMESPACE}TestDynload MODULE testDynload.c)
|
||||
SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}TestDynload PROPERTY LABELS ${KWSYS_LABELS_LIB})
|
||||
ADD_DEPENDENCIES(${KWSYS_NAMESPACE}TestDynload ${KWSYS_NAMESPACE})
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${KWSYS_NAMESPACE}TestDynload)
|
||||
+endif()
|
||||
ENDIF(KWSYS_USE_DynamicLoader)
|
||||
CREATE_TEST_SOURCELIST(
|
||||
KWSYS_CXX_TEST_SRCS ${KWSYS_NAMESPACE}TestsCxx.cxx
|
||||
@@ -934,6 +937,9 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
|
||||
ADD_EXECUTABLE(${KWSYS_NAMESPACE}TestsCxx ${KWSYS_CXX_TEST_SRCS})
|
||||
SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}TestsCxx PROPERTY LABELS ${KWSYS_LABELS_EXE})
|
||||
TARGET_LINK_LIBRARIES(${KWSYS_NAMESPACE}TestsCxx ${KWSYS_NAMESPACE})
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${KWSYS_NAMESPACE}TestsCxx)
|
||||
+endif()
|
||||
SET(TEST_SYSTEMTOOLS_BIN_FILE
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/testSystemTools.bin")
|
||||
SET(TEST_SYSTEMTOOLS_SRC_FILE
|
||||
diff -rupN cmake-2.8.7/Utilities/cmbzip2/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmbzip2/CMakeLists.txt
|
||||
--- cmake-2.8.7/Utilities/cmbzip2/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100
|
||||
+++ cmake-2.8.7.cotire/Utilities/cmbzip2/CMakeLists.txt 2012-02-22 20:45:26.000000000 +0100
|
||||
@@ -2,3 +2,6 @@ project(bzip2)
|
||||
add_definitions(-D_FILE_OFFSET_BITS=64)
|
||||
add_library(cmbzip2
|
||||
blocksort.c huffman.c crctable.c randtable.c compress.c decompress.c bzlib.c)
|
||||
+if (COMMAND cotire)
|
||||
+cotire(cmbzip2)
|
||||
+endif()
|
||||
\ No newline at end of file
|
||||
diff -rupN cmake-2.8.7/Utilities/cmcompress/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmcompress/CMakeLists.txt
|
||||
--- cmake-2.8.7/Utilities/cmcompress/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100
|
||||
+++ cmake-2.8.7.cotire/Utilities/cmcompress/CMakeLists.txt 2012-02-22 20:45:29.000000000 +0100
|
||||
@@ -3,3 +3,6 @@ PROJECT(CMCompress)
|
||||
ADD_LIBRARY(cmcompress cmcompress.c)
|
||||
|
||||
INSTALL(FILES Copyright.txt DESTINATION ${CMake_DOC_DEST}/cmcompress)
|
||||
+if (COMMAND cotire)
|
||||
+cotire(cmcompress)
|
||||
+endif()
|
||||
\ No newline at end of file
|
||||
diff -rupN cmake-2.8.7/Utilities/cmcurl/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmcurl/CMakeLists.txt
|
||||
--- cmake-2.8.7/Utilities/cmcurl/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100
|
||||
+++ cmake-2.8.7.cotire/Utilities/cmcurl/CMakeLists.txt 2012-02-22 20:43:57.000000000 +0100
|
||||
@@ -706,6 +706,9 @@ IF(CMAKE_BUILD_CURL_SHARED)
|
||||
RUNTIME_OUTPUT_DIRECTORY ${CMake_BIN_DIR})
|
||||
INSTALL_TARGETS(/bin cmcurl)
|
||||
ENDIF(CMAKE_BUILD_CURL_SHARED)
|
||||
+if (COMMAND cotire)
|
||||
+cotire(cmcurl)
|
||||
+endif()
|
||||
|
||||
OPTION(CURL_TESTING "Do libCurl testing" OFF)
|
||||
IF(CURL_TESTING)
|
||||
diff -rupN cmake-2.8.7/Utilities/cmexpat/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmexpat/CMakeLists.txt
|
||||
--- cmake-2.8.7/Utilities/cmexpat/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100
|
||||
+++ cmake-2.8.7.cotire/Utilities/cmexpat/CMakeLists.txt 2012-02-22 20:45:40.000000000 +0100
|
||||
@@ -32,3 +32,6 @@ CONFIGURE_FILE(${CMEXPAT_SOURCE_DIR}/exp
|
||||
|
||||
ADD_LIBRARY(cmexpat ${expat_SRCS})
|
||||
INSTALL(FILES COPYING DESTINATION ${CMake_DOC_DEST}/cmexpat)
|
||||
+if (COMMAND cotire)
|
||||
+cotire(cmexpat)
|
||||
+endif()
|
||||
\ No newline at end of file
|
||||
diff -rupN cmake-2.8.7/Utilities/cmlibarchive/libarchive/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmlibarchive/libarchive/CMakeLists.txt
|
||||
--- cmake-2.8.7/Utilities/cmlibarchive/libarchive/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100
|
||||
+++ cmake-2.8.7.cotire/Utilities/cmlibarchive/libarchive/CMakeLists.txt 2012-02-22 20:45:55.000000000 +0100
|
||||
@@ -116,6 +116,9 @@ IF(BUILD_ARCHIVE_WITHIN_CMAKE)
|
||||
# and call the library cmlibarchive
|
||||
ADD_LIBRARY(cmlibarchive STATIC ${libarchive_SOURCES} ${include_HEADERS})
|
||||
TARGET_LINK_LIBRARIES(cmlibarchive ${ADDITIONAL_LIBS})
|
||||
+if (COMMAND cotire)
|
||||
+cotire(cmlibarchive)
|
||||
+endif()
|
||||
ELSE()
|
||||
# Libarchive is a shared library
|
||||
ADD_LIBRARY(archive SHARED ${libarchive_SOURCES} ${include_HEADERS})
|
||||
@@ -123,7 +126,10 @@ ELSE()
|
||||
SET_TARGET_PROPERTIES(archive PROPERTIES SOVERSION ${SOVERSION})
|
||||
SET_TARGET_PROPERTIES(archive PROPERTIES
|
||||
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
|
||||
-
|
||||
+if (COMMAND cotire)
|
||||
+cotire(archive)
|
||||
+endif()
|
||||
+
|
||||
# archive_static is a static library
|
||||
ADD_LIBRARY(archive_static STATIC ${libarchive_SOURCES} ${include_HEADERS})
|
||||
SET_TARGET_PROPERTIES(archive_static PROPERTIES COMPILE_DEFINITIONS
|
||||
@@ -134,6 +140,9 @@ ELSE()
|
||||
IF(NOT WIN32 OR CYGWIN)
|
||||
SET_TARGET_PROPERTIES(archive_static PROPERTIES OUTPUT_NAME archive)
|
||||
ENDIF(NOT WIN32 OR CYGWIN)
|
||||
+if (COMMAND cotire)
|
||||
+cotire(archive_static)
|
||||
+endif()
|
||||
|
||||
# How to install the libraries
|
||||
INSTALL(TARGETS archive archive_static
|
||||
diff -rupN cmake-2.8.7/Utilities/cmzlib/CMakeLists.txt cmake-2.8.7.cotire/Utilities/cmzlib/CMakeLists.txt
|
||||
--- cmake-2.8.7/Utilities/cmzlib/CMakeLists.txt 2011-12-30 17:49:58.000000000 +0100
|
||||
+++ cmake-2.8.7.cotire/Utilities/cmzlib/CMakeLists.txt 2012-02-22 20:42:30.000000000 +0100
|
||||
@@ -39,5 +39,7 @@ ENDFOREACH(name)
|
||||
|
||||
|
||||
ADD_LIBRARY(cmzlib ${ZLIB_SRCS})
|
||||
-
|
||||
+if (COMMAND cmzlib)
|
||||
+cotire(cmzlib)
|
||||
+endif()
|
||||
INSTALL(FILES Copyright.txt DESTINATION ${CMake_DOC_DEST}/cmzlib)
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
diff -rupN cminpack-1.1.4/CMakeLists.txt cminpack-1.1.4.cotire/CMakeLists.txt
|
||||
--- cminpack-1.1.4/CMakeLists.txt 2011-04-15 08:51:13.000000000 +0200
|
||||
+++ cminpack-1.1.4.cotire/CMakeLists.txt 2012-03-24 20:21:19.000000000 +0100
|
||||
@@ -6,6 +6,7 @@ project (CMINPACK)
|
||||
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
|
||||
|
||||
include(${PROJECT_SOURCE_DIR}/cmake/cminpack_utils.cmake)
|
||||
+include(${PROJECT_SOURCE_DIR}/cmake/cotire.cmake)
|
||||
# Set version and OS-specific settings
|
||||
set(CMINPACK_VERSION 1.0.90 CACHE STRING "CMinpack version")
|
||||
DISSECT_VERSION()
|
||||
@@ -70,3 +71,6 @@ endif (USE_FPIC AND NOT SHARED_LIBS)
|
||||
|
||||
set_target_properties(cminpack PROPERTIES VERSION ${CMINPACK_VERSION})
|
||||
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(cminpack)
|
||||
+endif()
|
||||
|
|
@ -0,0 +1,74 @@
|
|||
diff -rupN fsedit-qt5-master/CMakeLists.txt fsedit-qt5-cotire/CMakeLists.txt
|
||||
--- fsedit-qt5-master/CMakeLists.txt 2013-09-25 17:02:56.000000000 +0200
|
||||
+++ fsedit-qt5-cotire/CMakeLists.txt 2014-08-28 17:59:58.000000000 +0200
|
||||
@@ -3,6 +3,9 @@ cmake_minimum_required(VERSION 2.8 FATAL
|
||||
cmake_policy(SET CMP0020 NEW)
|
||||
project(FSEditor)
|
||||
|
||||
+include(cotire)
|
||||
+set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY")
|
||||
+
|
||||
include(InstallRequiredSystemLibraries)
|
||||
|
||||
set(VERSION_MAJOR 1)
|
||||
diff -rupN fsedit-qt5-master/source/application/CMakeLists.txt fsedit-qt5-cotire/source/application/CMakeLists.txt
|
||||
--- fsedit-qt5-master/source/application/CMakeLists.txt 2013-09-25 17:02:56.000000000 +0200
|
||||
+++ fsedit-qt5-cotire/source/application/CMakeLists.txt 2014-08-28 16:48:42.000000000 +0200
|
||||
@@ -20,3 +20,7 @@ install(TARGETS fseditor DESTINATION bin
|
||||
|
||||
include(tr_sources)
|
||||
add_tr_sources(${sources})
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(fseditor)
|
||||
+endif()
|
||||
diff -rupN fsedit-qt5-master/source/libfstest/CMakeLists.txt fsedit-qt5-cotire/source/libfstest/CMakeLists.txt
|
||||
--- fsedit-qt5-master/source/libfstest/CMakeLists.txt 2013-09-25 17:02:56.000000000 +0200
|
||||
+++ fsedit-qt5-cotire/source/libfstest/CMakeLists.txt 2014-08-28 16:49:11.000000000 +0200
|
||||
@@ -3,8 +3,12 @@
|
||||
|
||||
add_library(fstest STATIC fstest.h fstest.cpp)
|
||||
target_link_libraries(fstest
|
||||
- Qt5::Widgets # ${QT_LIBRARIES}
|
||||
+ Qt5::Widgets Qt5::Test # ${QT_LIBRARIES}
|
||||
)
|
||||
set_target_properties(fstest
|
||||
PROPERTIES PROJECT_LABEL "libfstest"
|
||||
)
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(fstest)
|
||||
+endif()
|
||||
diff -rupN fsedit-qt5-master/source/libmodel/CMakeLists.txt fsedit-qt5-cotire/source/libmodel/CMakeLists.txt
|
||||
--- fsedit-qt5-master/source/libmodel/CMakeLists.txt 2013-09-25 17:02:56.000000000 +0200
|
||||
+++ fsedit-qt5-cotire/source/libmodel/CMakeLists.txt 2014-08-28 16:49:18.000000000 +0200
|
||||
@@ -37,3 +37,7 @@ fstest(test_libmodel LibModel)
|
||||
|
||||
include(tr_sources)
|
||||
add_tr_sources(${sources} ${headers} ${moc_headers})
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(model)
|
||||
+endif()
|
||||
diff -rupN fsedit-qt5-master/source/libmodelcommands/CMakeLists.txt fsedit-qt5-cotire/source/libmodelcommands/CMakeLists.txt
|
||||
--- fsedit-qt5-master/source/libmodelcommands/CMakeLists.txt 2013-09-25 17:02:56.000000000 +0200
|
||||
+++ fsedit-qt5-cotire/source/libmodelcommands/CMakeLists.txt 2014-08-28 16:49:25.000000000 +0200
|
||||
@@ -21,3 +21,7 @@ target_link_libraries(modelcommands
|
||||
|
||||
include(tr_sources)
|
||||
add_tr_sources(${sources} ${headers})
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(modelcommands)
|
||||
+endif()
|
||||
diff -rupN fsedit-qt5-master/source/libui/CMakeLists.txt fsedit-qt5-cotire/source/libui/CMakeLists.txt
|
||||
--- fsedit-qt5-master/source/libui/CMakeLists.txt 2013-09-25 17:02:56.000000000 +0200
|
||||
+++ fsedit-qt5-cotire/source/libui/CMakeLists.txt 2014-08-28 12:03:28.000000000 +0200
|
||||
@@ -48,3 +48,7 @@ target_link_libraries(ui
|
||||
|
||||
include(tr_sources)
|
||||
add_tr_sources(${sources} ${headers} ${moc_headers} ${forms})
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(ui)
|
||||
+endif()
|
||||
|
|
@ -0,0 +1,68 @@
|
|||
diff -rupN fseditor-1.0/CMakeLists.txt fseditor-1.0.cotire/CMakeLists.txt
|
||||
--- fseditor-1.0/CMakeLists.txt 2010-10-01 07:43:16.000000000 +0200
|
||||
+++ fseditor-1.0.cotire/CMakeLists.txt 2014-08-28 18:28:39.000000000 +0200
|
||||
@@ -1,6 +1,9 @@
|
||||
CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
|
||||
PROJECT(FSEditor)
|
||||
|
||||
+include(cotire)
|
||||
+set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY")
|
||||
+
|
||||
INCLUDE(InstallRequiredSystemLibraries)
|
||||
|
||||
SET(VERSION_MAJOR 1)
|
||||
diff -rupN fseditor-1.0/source/application/CMakeLists.txt fseditor-1.0.cotire/source/application/CMakeLists.txt
|
||||
--- fseditor-1.0/source/application/CMakeLists.txt 2010-10-01 07:43:16.000000000 +0200
|
||||
+++ fseditor-1.0.cotire/source/application/CMakeLists.txt 2014-08-28 18:24:56.000000000 +0200
|
||||
@@ -17,3 +17,7 @@ INSTALL(TARGETS fseditor DESTINATION bin
|
||||
|
||||
INCLUDE(tr_sources)
|
||||
ADD_TR_SOURCES(${sources})
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(fseditor)
|
||||
+endif()
|
||||
diff -rupN fseditor-1.0/source/libfstest/CMakeLists.txt fseditor-1.0.cotire/source/libfstest/CMakeLists.txt
|
||||
--- fseditor-1.0/source/libfstest/CMakeLists.txt 2010-10-01 07:43:16.000000000 +0200
|
||||
+++ fseditor-1.0.cotire/source/libfstest/CMakeLists.txt 2014-08-28 18:25:41.000000000 +0200
|
||||
@@ -3,3 +3,7 @@ INCLUDE(${QT_USE_FILE})
|
||||
|
||||
ADD_LIBRARY(fstest STATIC fstest.h fstest.cpp)
|
||||
SET_TARGET_PROPERTIES(fstest PROPERTIES PROJECT_LABEL "libfstest")
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(fstest)
|
||||
+endif()
|
||||
diff -rupN fseditor-1.0/source/libmodel/CMakeLists.txt fseditor-1.0.cotire/source/libmodel/CMakeLists.txt
|
||||
--- fseditor-1.0/source/libmodel/CMakeLists.txt 2010-10-01 07:43:16.000000000 +0200
|
||||
+++ fseditor-1.0.cotire/source/libmodel/CMakeLists.txt 2013-10-06 20:05:06.000000000 +0200
|
||||
@@ -34,3 +34,7 @@ FSTEST(test_libmodel LibModel)
|
||||
|
||||
INCLUDE(tr_sources)
|
||||
ADD_TR_SOURCES(${sources} ${headers} ${moc_headers})
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(model)
|
||||
+endif()
|
||||
diff -rupN fseditor-1.0/source/libmodelcommands/CMakeLists.txt fseditor-1.0.cotire/source/libmodelcommands/CMakeLists.txt
|
||||
--- fseditor-1.0/source/libmodelcommands/CMakeLists.txt 2010-10-01 07:43:16.000000000 +0200
|
||||
+++ fseditor-1.0.cotire/source/libmodelcommands/CMakeLists.txt 2013-10-06 20:05:11.000000000 +0200
|
||||
@@ -18,3 +18,7 @@ TARGET_LINK_LIBRARIES(modelcommands mode
|
||||
|
||||
INCLUDE(tr_sources)
|
||||
ADD_TR_SOURCES(${sources} ${headers})
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(modelcommands)
|
||||
+endif()
|
||||
diff -rupN fseditor-1.0/source/libui/CMakeLists.txt fseditor-1.0.cotire/source/libui/CMakeLists.txt
|
||||
--- fseditor-1.0/source/libui/CMakeLists.txt 2010-10-01 07:43:16.000000000 +0200
|
||||
+++ fseditor-1.0.cotire/source/libui/CMakeLists.txt 2013-10-06 20:05:18.000000000 +0200
|
||||
@@ -44,3 +44,7 @@ TARGET_LINK_LIBRARIES(ui model modelcomm
|
||||
|
||||
INCLUDE(tr_sources)
|
||||
ADD_TR_SOURCES(${sources} ${headers} ${moc_headers} ${forms})
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(ui)
|
||||
+endif()
|
||||
|
|
@ -0,0 +1,118 @@
|
|||
diff -rupN hdf5-1.8.8/CMakeLists.txt hdf5-1.8.8.cotire/CMakeLists.txt
|
||||
--- hdf5-1.8.8/CMakeLists.txt 2011-11-07 23:11:41.000000000 +0100
|
||||
+++ hdf5-1.8.8.cotire/CMakeLists.txt 2012-03-24 17:30:29.000000000 +0100
|
||||
@@ -200,6 +200,7 @@ SET (HDF5_PACKAGE_BUGREPORT "help@hdfgro
|
||||
#-----------------------------------------------------------------------------
|
||||
INCLUDE (${HDF5_RESOURCES_DIR}/HDFMacros.cmake)
|
||||
INCLUDE (${HDF5_RESOURCES_DIR}/HDF5Macros.cmake)
|
||||
+INCLUDE (${HDF5_RESOURCES_DIR}/cotire.cmake)
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Setup output Directories
|
||||
diff -rupN hdf5-1.8.8/c++/src/CMakeLists.txt hdf5-1.8.8.cotire/c++/src/CMakeLists.txt
|
||||
--- hdf5-1.8.8/c++/src/CMakeLists.txt 2011-11-07 23:11:40.000000000 +0100
|
||||
+++ hdf5-1.8.8.cotire/c++/src/CMakeLists.txt 2012-03-24 17:29:43.000000000 +0100
|
||||
@@ -85,6 +85,9 @@ ADD_LIBRARY (${HDF5_CPP_LIB_TARGET} ${LI
|
||||
TARGET_LINK_LIBRARIES (${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIB_TARGET}")
|
||||
H5_SET_LIB_OPTIONS (${HDF5_CPP_LIB_TARGET} ${HDF5_CPP_LIB_NAME} ${LIB_TYPE})
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${HDF5_CPP_LIB_TARGET})
|
||||
+endif()
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Add file(s) to CMake Install
|
||||
diff -rupN hdf5-1.8.8/fortran/src/CMakeLists.txt hdf5-1.8.8.cotire/fortran/src/CMakeLists.txt
|
||||
--- hdf5-1.8.8/fortran/src/CMakeLists.txt 2011-11-07 23:11:41.000000000 +0100
|
||||
+++ hdf5-1.8.8.cotire/fortran/src/CMakeLists.txt 2012-03-24 17:30:02.000000000 +0100
|
||||
@@ -118,6 +118,9 @@ ADD_LIBRARY (${HDF5_F90_C_LIB_TARGET} ${
|
||||
TARGET_LINK_LIBRARIES (${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIB_TARGET}")
|
||||
H5_SET_LIB_OPTIONS (${HDF5_F90_C_LIB_TARGET} ${HDF5_F90_C_LIB_NAME} ${LIB_TYPE})
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${HDF5_F90_C_LIB_TARGET})
|
||||
+endif()
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Fortran 2003 standard
|
||||
@@ -221,6 +224,7 @@ SET_TARGET_PROPERTIES (${HDF5_F90_LIB_TA
|
||||
TARGET_LINK_LIBRARIES (${HDF5_F90_LIB_TARGET} ${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_LIB_TARGET}")
|
||||
H5_SET_LIB_OPTIONS (${HDF5_F90_LIB_TARGET} ${HDF5_F90_LIB_NAME} ${LIB_TYPE})
|
||||
+cotire(${HDF5_F90_LIB_TARGET})
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Add file(s) to CMake Install
|
||||
diff -rupN hdf5-1.8.8/hl/c++/src/CMakeLists.txt hdf5-1.8.8.cotire/hl/c++/src/CMakeLists.txt
|
||||
--- hdf5-1.8.8/hl/c++/src/CMakeLists.txt 2011-11-07 23:11:39.000000000 +0100
|
||||
+++ hdf5-1.8.8.cotire/hl/c++/src/CMakeLists.txt 2012-03-24 17:29:52.000000000 +0100
|
||||
@@ -18,6 +18,9 @@ TARGET_LINK_LIBRARIES (
|
||||
)
|
||||
SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_CPP_LIB_TARGET}")
|
||||
H5_SET_LIB_OPTIONS (${HDF5_HL_CPP_LIB_TARGET} ${HDF5_HL_CPP_LIB_NAME} ${LIB_TYPE})
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${HDF5_HL_CPP_LIB_TARGET})
|
||||
+endif()
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Add file(s) to CMake Install
|
||||
diff -rupN hdf5-1.8.8/hl/src/CMakeLists.txt hdf5-1.8.8.cotire/hl/src/CMakeLists.txt
|
||||
--- hdf5-1.8.8/hl/src/CMakeLists.txt 2011-11-07 23:11:38.000000000 +0100
|
||||
+++ hdf5-1.8.8.cotire/hl/src/CMakeLists.txt 2012-03-24 17:30:11.000000000 +0100
|
||||
@@ -37,6 +37,9 @@ ADD_LIBRARY (${HDF5_HL_LIB_TARGET} ${LIB
|
||||
TARGET_LINK_LIBRARIES (${HDF5_HL_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_HL_LIB_TARGET}")
|
||||
H5_SET_LIB_OPTIONS (${HDF5_HL_LIB_TARGET} ${HDF5_HL_LIB_NAME} ${LIB_TYPE})
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${HDF5_HL_LIB_TARGET})
|
||||
+endif()
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Add file(s) to CMake Install
|
||||
diff -rupN hdf5-1.8.8/src/CMakeLists.txt hdf5-1.8.8.cotire/src/CMakeLists.txt
|
||||
--- hdf5-1.8.8/src/CMakeLists.txt 2011-11-07 23:11:30.000000000 +0100
|
||||
+++ hdf5-1.8.8.cotire/src/CMakeLists.txt 2012-03-24 17:29:26.000000000 +0100
|
||||
@@ -631,6 +631,16 @@ ADD_LIBRARY (${HDF5_LIB_TARGET} ${LIB_TY
|
||||
TARGET_LINK_LIBRARIES (${HDF5_LIB_TARGET} ${LINK_LIBS})
|
||||
SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT ${HDF5_LIB_TARGET})
|
||||
H5_SET_LIB_OPTIONS (${HDF5_LIB_TARGET} ${HDF5_LIB_NAME} ${LIB_TYPE})
|
||||
+#set_target_properties(${HDF5_LIB_TARGET} PROPERTIES COTIRE_IGNORED_INCLUDE_DIRECTORIES "/Developer/usr;/usr/llvm-gcc-4.2;${CMAKE_SOURCE_DIR};${CMAKE_BINARY_DIR}")
|
||||
+
|
||||
+if (COMMAND cotire)
|
||||
+SET_SOURCE_FILES_PROPERTIES (
|
||||
+"${HDF5_BINARY_DIR}/H5overflow.h"
|
||||
+"${HDF5_BINARY_DIR}/H5version.h"
|
||||
+"${HDF5_BINARY_DIR}/H5Edefin.h"
|
||||
+PROPERTIES COTIRE_DEPENDENCY FALSE)
|
||||
+cotire(${HDF5_LIB_TARGET})
|
||||
+endif()
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# Add file(s) to CMake Install
|
||||
Binary files hdf5-1.8.8/src/H5public.h.gch and hdf5-1.8.8.cotire/src/H5public.h.gch differ
|
||||
diff -rupN hdf5-1.8.8/test/CMakeLists.txt hdf5-1.8.8.cotire/test/CMakeLists.txt
|
||||
--- hdf5-1.8.8/test/CMakeLists.txt 2011-11-07 23:11:23.000000000 +0100
|
||||
+++ hdf5-1.8.8.cotire/test/CMakeLists.txt 2012-03-24 17:30:22.000000000 +0100
|
||||
@@ -30,6 +30,9 @@ IF (MINGW)
|
||||
ENDIF (MINGW)
|
||||
TARGET_LINK_LIBRARIES (${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET})
|
||||
H5_SET_LIB_OPTIONS (${HDF5_TEST_LIB_TARGET} ${HDF5_TEST_LIB_NAME} ${LIB_TYPE})
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${HDF5_TEST_LIB_TARGET})
|
||||
+endif()
|
||||
|
||||
# --------------------------------------------------------------------
|
||||
# Copy all the HDF5 files from the test directory into the source directory
|
||||
diff -rupN hdf5-1.8.8/tools/lib/CMakeLists.txt hdf5-1.8.8.cotire/tools/lib/CMakeLists.txt
|
||||
--- hdf5-1.8.8/tools/lib/CMakeLists.txt 2011-11-07 23:11:35.000000000 +0100
|
||||
+++ hdf5-1.8.8.cotire/tools/lib/CMakeLists.txt 2012-03-24 17:28:41.000000000 +0100
|
||||
@@ -40,6 +40,9 @@ H5_SET_LIB_OPTIONS (
|
||||
HDF5_TOOLS_LIB_NAME_RELEASE
|
||||
HDF5_TOOLS_LIB_NAME_DEBUG
|
||||
)
|
||||
+if (COMMAND cotire)
|
||||
+cotire(${HDF5_TOOLS_LIB_TARGET})
|
||||
+endif()
|
||||
|
||||
##############################################################################
|
||||
##############################################################################
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
diff -rupN libpng-1.5.9/CMakeLists.txt libpng-1.5.9.cotire/CMakeLists.txt
|
||||
--- libpng-1.5.9/CMakeLists.txt 2012-02-18 21:31:14.000000000 +0100
|
||||
+++ libpng-1.5.9.cotire/CMakeLists.txt 2012-03-24 18:08:54.000000000 +0100
|
||||
@@ -9,6 +9,8 @@
|
||||
cmake_minimum_required(VERSION 2.4.4)
|
||||
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
|
||||
|
||||
+include("${CMAKE_SOURCE_DIR}/cotire.cmake")
|
||||
+
|
||||
if(UNIX AND NOT DEFINED CMAKE_BUILD_TYPE)
|
||||
if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
|
||||
# workaround CMake 2.4.x bug
|
||||
@@ -146,6 +148,12 @@ if(PNG_SHARED)
|
||||
set_target_properties(${PNG_LIB_NAME} PROPERTIES IMPORT_PREFIX "lib")
|
||||
endif()
|
||||
target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY})
|
||||
+ if (COMMAND cotire)
|
||||
+ cotire(${PNG_LIB_NAME})
|
||||
+ if (TARGET ${PNG_LIB_NAME}_unity)
|
||||
+ target_link_libraries(${PNG_LIB_NAME}_unity ${ZLIB_LIBRARY} ${M_LIBRARY})
|
||||
+ endif()
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
if(PNG_STATIC)
|
||||
@@ -157,6 +165,12 @@ if(PNG_STATIC)
|
||||
set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES PREFIX "lib")
|
||||
endif()
|
||||
target_link_libraries(${PNG_LIB_NAME_STATIC} ${ZLIB_LIBRARY} ${M_LIBRARY})
|
||||
+ if (COMMAND cotire)
|
||||
+ cotire(${PNG_LIB_NAME_STATIC})
|
||||
+ if (TARGET ${PNG_LIB_NAME_STATIC}_unity)
|
||||
+ target_link_libraries(${PNG_LIB_NAME_STATIC}_unity ${ZLIB_LIBRARY} ${M_LIBRARY})
|
||||
+ endif()
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
if(PNG_SHARED AND WIN32)
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
diff -rupN llvm-3.0.src/CMakeLists.txt llvm-3.0.src.cotire/CMakeLists.txt
|
||||
--- llvm-3.0.src/CMakeLists.txt 2011-10-06 03:51:51.000000000 +0200
|
||||
+++ llvm-3.0.src.cotire/CMakeLists.txt 2012-03-26 20:59:22.000000000 +0200
|
||||
@@ -15,6 +15,7 @@ set(PACKAGE_VERSION "3.0")
|
||||
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
||||
|
||||
include(VersionFromVCS)
|
||||
+include(cotire)
|
||||
|
||||
option(LLVM_APPEND_VC_REV
|
||||
"Append the version control system revision id to LLVM version" OFF)
|
||||
diff -rupN llvm-3.0.src/cmake/modules/AddLLVM.cmake llvm-3.0.src.cotire/cmake/modules/AddLLVM.cmake
|
||||
--- llvm-3.0.src/cmake/modules/AddLLVM.cmake 2011-07-30 10:47:05.000000000 +0200
|
||||
+++ llvm-3.0.src.cotire/cmake/modules/AddLLVM.cmake 2012-03-26 20:59:22.000000000 +0200
|
||||
@@ -25,6 +25,9 @@ macro(add_llvm_library name)
|
||||
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
||||
endif()
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Libraries")
|
||||
+ if (COMMAND cotire)
|
||||
+ cotire(${name})
|
||||
+ endif()
|
||||
endmacro(add_llvm_library name)
|
||||
|
||||
macro(add_llvm_library_dependencies name)
|
||||
@@ -69,6 +72,9 @@ ${name} ignored.")
|
||||
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
|
||||
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
||||
endif()
|
||||
+ if (COMMAND cotire)
|
||||
+ cotire(${name})
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Loadable modules")
|
||||
@@ -89,6 +95,9 @@ macro(add_llvm_executable name)
|
||||
add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} )
|
||||
endif( LLVM_COMMON_DEPENDS )
|
||||
link_system_libs( ${name} )
|
||||
+ if (COMMAND cotire)
|
||||
+ cotire(${name})
|
||||
+ endif()
|
||||
endmacro(add_llvm_executable name)
|
||||
|
||||
|
||||
diff -rupN llvm-3.0.src/lib/Analysis/CMakeLists.txt llvm-3.0.src.cotire/lib/Analysis/CMakeLists.txt
|
||||
--- llvm-3.0.src/lib/Analysis/CMakeLists.txt 2011-07-29 02:14:25.000000000 +0200
|
||||
+++ llvm-3.0.src.cotire/lib/Analysis/CMakeLists.txt 2012-03-26 20:59:36.000000000 +0200
|
||||
@@ -1,3 +1,7 @@
|
||||
+if (COMMAND cotire)
|
||||
+ set_source_files_properties (ConstantFolding.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
|
||||
+endif()
|
||||
+
|
||||
add_llvm_library(LLVMAnalysis
|
||||
AliasAnalysis.cpp
|
||||
AliasAnalysisCounter.cpp
|
||||
diff -rupN llvm-3.0.src/lib/Support/CMakeLists.txt llvm-3.0.src.cotire/lib/Support/CMakeLists.txt
|
||||
--- llvm-3.0.src/lib/Support/CMakeLists.txt 2011-09-13 21:42:16.000000000 +0200
|
||||
+++ llvm-3.0.src.cotire/lib/Support/CMakeLists.txt 2012-03-26 20:59:22.000000000 +0200
|
||||
@@ -4,6 +4,10 @@ if( MINGW )
|
||||
set(LLVM_REQUIRES_EH 1)
|
||||
endif()
|
||||
|
||||
+if (COMMAND cotire)
|
||||
+ set_source_files_properties (IsInf.cpp IsNAN.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
|
||||
+endif()
|
||||
+
|
||||
add_llvm_library(LLVMSupport
|
||||
APFloat.cpp
|
||||
APInt.cpp
|
||||
|
|
@ -0,0 +1,69 @@
|
|||
diff -rupN llvm-3.1.src/CMakeLists.txt llvm-3.1.src.cotire/CMakeLists.txt
|
||||
--- llvm-3.1.src/CMakeLists.txt 2012-05-16 00:06:08.000000000 +0200
|
||||
+++ llvm-3.1.src.cotire/CMakeLists.txt 2012-05-23 19:49:12.000000000 +0200
|
||||
@@ -18,6 +18,7 @@ set(PACKAGE_VERSION "${LLVM_VERSION_MAJO
|
||||
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
||||
|
||||
include(VersionFromVCS)
|
||||
+include(cotire)
|
||||
|
||||
option(LLVM_APPEND_VC_REV
|
||||
"Append the version control system revision id to LLVM version" OFF)
|
||||
diff -rupN llvm-3.1.src/cmake/modules/AddLLVM.cmake llvm-3.1.src.cotire/cmake/modules/AddLLVM.cmake
|
||||
--- llvm-3.1.src/cmake/modules/AddLLVM.cmake 2011-11-29 20:25:30.000000000 +0100
|
||||
+++ llvm-3.1.src.cotire/cmake/modules/AddLLVM.cmake 2012-05-23 19:49:59.000000000 +0200
|
||||
@@ -25,6 +25,9 @@ macro(add_llvm_library name)
|
||||
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
||||
endif()
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Libraries")
|
||||
+ if (COMMAND cotire)
|
||||
+ cotire(${name})
|
||||
+ endif()
|
||||
|
||||
# Add the explicit dependency information for this library.
|
||||
#
|
||||
@@ -68,6 +71,9 @@ ${name} ignored.")
|
||||
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
|
||||
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
||||
endif()
|
||||
+ if (COMMAND cotire)
|
||||
+ cotire(${name})
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Loadable modules")
|
||||
@@ -88,6 +94,9 @@ macro(add_llvm_executable name)
|
||||
add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} )
|
||||
endif( LLVM_COMMON_DEPENDS )
|
||||
link_system_libs( ${name} )
|
||||
+ if (COMMAND cotire)
|
||||
+ cotire(${name})
|
||||
+ endif()
|
||||
endmacro(add_llvm_executable name)
|
||||
|
||||
|
||||
diff -rupN llvm-3.1.src/lib/Analysis/CMakeLists.txt llvm-3.1.src.cotire/lib/Analysis/CMakeLists.txt
|
||||
--- llvm-3.1.src/lib/Analysis/CMakeLists.txt 2012-03-16 06:51:52.000000000 +0100
|
||||
+++ llvm-3.1.src.cotire/lib/Analysis/CMakeLists.txt 2012-05-23 19:49:12.000000000 +0200
|
||||
@@ -1,3 +1,7 @@
|
||||
+if (COMMAND cotire)
|
||||
+ set_source_files_properties (ConstantFolding.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
|
||||
+endif()
|
||||
+
|
||||
add_llvm_library(LLVMAnalysis
|
||||
AliasAnalysis.cpp
|
||||
AliasAnalysisCounter.cpp
|
||||
diff -rupN llvm-3.1.src/lib/Support/CMakeLists.txt llvm-3.1.src.cotire/lib/Support/CMakeLists.txt
|
||||
--- llvm-3.1.src/lib/Support/CMakeLists.txt 2012-04-17 22:03:03.000000000 +0200
|
||||
+++ llvm-3.1.src.cotire/lib/Support/CMakeLists.txt 2012-05-23 19:49:12.000000000 +0200
|
||||
@@ -4,6 +4,10 @@ if( MINGW )
|
||||
set(LLVM_REQUIRES_EH 1)
|
||||
endif()
|
||||
|
||||
+if (COMMAND cotire)
|
||||
+ set_source_files_properties (IsInf.cpp IsNAN.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
|
||||
+endif()
|
||||
+
|
||||
add_llvm_library(LLVMSupport
|
||||
APFloat.cpp
|
||||
APInt.cpp
|
||||
|
|
@ -0,0 +1,128 @@
|
|||
diff -rupN llvm-3.3.src/CMakeLists.txt llvm-3.3.src.cotire/CMakeLists.txt
|
||||
--- llvm-3.3.src/CMakeLists.txt 2013-05-06 18:23:07.000000000 +0200
|
||||
+++ llvm-3.3.src.cotire/CMakeLists.txt 2013-10-13 10:05:20.000000000 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
# See docs/CMake.html for instructions about how to build LLVM with CMake.
|
||||
|
||||
project(LLVM)
|
||||
-cmake_minimum_required(VERSION 2.8)
|
||||
+cmake_minimum_required(VERSION 2.8.11)
|
||||
|
||||
# Add path for custom modules
|
||||
set(CMAKE_MODULE_PATH
|
||||
@@ -21,6 +21,8 @@ if ( LLVM_USE_FOLDERS )
|
||||
endif()
|
||||
|
||||
include(VersionFromVCS)
|
||||
+include(cotire)
|
||||
+set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY")
|
||||
|
||||
option(LLVM_APPEND_VC_REV
|
||||
"Append the version control system revision id to LLVM version" OFF)
|
||||
@@ -187,7 +189,7 @@ option(LLVM_USE_OPROFILE
|
||||
# If enabled, verify we are on a platform that supports oprofile.
|
||||
if( LLVM_USE_OPROFILE )
|
||||
if( NOT CMAKE_SYSTEM_NAME MATCHES "Linux" )
|
||||
- message(FATAL_ERROR "OProfile support is available on Linux only.")
|
||||
+ message(FATAL_ERROR "OProfile support is available on Linux only.")
|
||||
endif( NOT CMAKE_SYSTEM_NAME MATCHES "Linux" )
|
||||
endif( LLVM_USE_OPROFILE )
|
||||
|
||||
diff -rupN llvm-3.3.src/cmake/modules/AddLLVM.cmake llvm-3.3.src.cotire/cmake/modules/AddLLVM.cmake
|
||||
--- llvm-3.3.src/cmake/modules/AddLLVM.cmake 2013-04-21 11:04:59.000000000 +0200
|
||||
+++ llvm-3.3.src.cotire/cmake/modules/AddLLVM.cmake 2013-10-13 10:43:04.000000000 +0200
|
||||
@@ -34,6 +34,10 @@ macro(add_llvm_library name)
|
||||
# property has been set to an empty value.
|
||||
get_property(lib_deps GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_${name})
|
||||
target_link_libraries(${name} ${lib_deps})
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endmacro(add_llvm_library name)
|
||||
|
||||
macro(add_llvm_loadable_module name)
|
||||
@@ -69,6 +73,10 @@ ${name} ignored.")
|
||||
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
|
||||
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
||||
endif()
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endif()
|
||||
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Loadable modules")
|
||||
@@ -101,6 +109,10 @@ macro(add_llvm_tool name)
|
||||
install(TARGETS ${name} RUNTIME DESTINATION bin)
|
||||
endif()
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Tools")
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endmacro(add_llvm_tool name)
|
||||
|
||||
|
||||
@@ -114,12 +126,20 @@ macro(add_llvm_example name)
|
||||
install(TARGETS ${name} RUNTIME DESTINATION examples)
|
||||
endif()
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Examples")
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endmacro(add_llvm_example name)
|
||||
|
||||
|
||||
macro(add_llvm_utility name)
|
||||
add_llvm_executable(${name} ${ARGN})
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Utils")
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endmacro(add_llvm_utility name)
|
||||
|
||||
|
||||
@@ -198,6 +218,10 @@ function(add_unittest test_suite test_na
|
||||
set(target_compile_flags "${target_compile_flags} -Wno-variadic-macros")
|
||||
endif ()
|
||||
set_property(TARGET ${test_name} PROPERTY COMPILE_FLAGS "${target_compile_flags}")
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endfunction()
|
||||
|
||||
# This function provides an automatic way to 'configure'-like generate a file
|
||||
diff -rupN llvm-3.3.src/include/llvm/Transforms/Utils/BlackList.h llvm-3.3.src.cotire/include/llvm/Transforms/Utils/BlackList.h
|
||||
--- llvm-3.3.src/include/llvm/Transforms/Utils/BlackList.h 2013-04-11 15:20:00.000000000 +0200
|
||||
+++ llvm-3.3.src.cotire/include/llvm/Transforms/Utils/BlackList.h 2013-10-13 11:52:41.000000000 +0200
|
||||
@@ -30,6 +30,9 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
//
|
||||
|
||||
+#ifndef LLVM_TRANSFORMS_UTILS_BLACKLIST_H
|
||||
+#define LLVM_TRANSFORMS_UTILS_BLACKLIST_H
|
||||
+
|
||||
#include "llvm/ADT/StringMap.h"
|
||||
|
||||
namespace llvm {
|
||||
@@ -57,3 +60,5 @@ class BlackList {
|
||||
};
|
||||
|
||||
} // namespace llvm
|
||||
+
|
||||
+#endif
|
||||
diff -rupN llvm-3.3.src/lib/Support/CMakeLists.txt llvm-3.3.src.cotire/lib/Support/CMakeLists.txt
|
||||
--- llvm-3.3.src/lib/Support/CMakeLists.txt 2013-04-23 10:28:39.000000000 +0200
|
||||
+++ llvm-3.3.src.cotire/lib/Support/CMakeLists.txt 2013-10-13 10:25:45.000000000 +0200
|
||||
@@ -1,3 +1,7 @@
|
||||
+if (COMMAND cotire)
|
||||
+ set_source_files_properties (IsInf.cpp IsNAN.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
|
||||
+endif()
|
||||
+
|
||||
add_llvm_library(LLVMSupport
|
||||
APFloat.cpp
|
||||
APInt.cpp
|
||||
|
|
@ -0,0 +1,100 @@
|
|||
diff -rupN llvm-3.4.src/CMakeLists.txt llvm-3.4.src.cotire/CMakeLists.txt
|
||||
--- llvm-3.4.src/CMakeLists.txt 2013-11-25 19:34:26.000000000 +0100
|
||||
+++ llvm-3.4.src.cotire/CMakeLists.txt 2014-01-06 20:25:12.000000000 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
# See docs/CMake.html for instructions about how to build LLVM with CMake.
|
||||
|
||||
project(LLVM)
|
||||
-cmake_minimum_required(VERSION 2.8)
|
||||
+cmake_minimum_required(VERSION 2.8.12)
|
||||
|
||||
# Add path for custom modules
|
||||
set(CMAKE_MODULE_PATH
|
||||
@@ -25,6 +25,8 @@ if ( LLVM_USE_FOLDERS )
|
||||
endif()
|
||||
|
||||
include(VersionFromVCS)
|
||||
+include(cotire)
|
||||
+set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY")
|
||||
|
||||
option(LLVM_APPEND_VC_REV
|
||||
"Append the version control system revision id to LLVM version" OFF)
|
||||
diff -rupN llvm-3.4.src/cmake/modules/AddLLVM.cmake llvm-3.4.src.cotire/cmake/modules/AddLLVM.cmake
|
||||
--- llvm-3.4.src/cmake/modules/AddLLVM.cmake 2013-08-27 21:25:01.000000000 +0200
|
||||
+++ llvm-3.4.src.cotire/cmake/modules/AddLLVM.cmake 2014-01-06 20:25:50.000000000 +0100
|
||||
@@ -41,6 +41,10 @@ macro(add_llvm_library name)
|
||||
# property has been set to an empty value.
|
||||
get_property(lib_deps GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_${name})
|
||||
target_link_libraries(${name} ${lib_deps})
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endmacro(add_llvm_library name)
|
||||
|
||||
macro(add_llvm_loadable_module name)
|
||||
@@ -78,6 +82,10 @@ ${name} ignored.")
|
||||
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
|
||||
endif()
|
||||
endif()
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endif()
|
||||
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Loadable modules")
|
||||
@@ -119,6 +127,10 @@ macro(add_llvm_tool name)
|
||||
endif()
|
||||
endif()
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Tools")
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endmacro(add_llvm_tool name)
|
||||
|
||||
|
||||
@@ -132,12 +144,20 @@ macro(add_llvm_example name)
|
||||
install(TARGETS ${name} RUNTIME DESTINATION examples)
|
||||
endif()
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Examples")
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endmacro(add_llvm_example name)
|
||||
|
||||
|
||||
macro(add_llvm_utility name)
|
||||
add_llvm_executable(${name} ${ARGN})
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Utils")
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endmacro(add_llvm_utility name)
|
||||
|
||||
|
||||
@@ -245,6 +265,10 @@ function(add_unittest test_suite test_na
|
||||
set(target_compile_flags "${target_compile_flags} -Wno-variadic-macros")
|
||||
endif ()
|
||||
set_property(TARGET ${test_name} PROPERTY COMPILE_FLAGS "${target_compile_flags}")
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endfunction()
|
||||
|
||||
# This function provides an automatic way to 'configure'-like generate a file
|
||||
diff -rupN llvm-3.4.src/lib/Support/CMakeLists.txt llvm-3.4.src.cotire/lib/Support/CMakeLists.txt
|
||||
--- llvm-3.4.src/lib/Support/CMakeLists.txt 2013-09-04 18:00:12.000000000 +0200
|
||||
+++ llvm-3.4.src.cotire/lib/Support/CMakeLists.txt 2014-01-06 20:27:36.000000000 +0100
|
||||
@@ -1,3 +1,7 @@
|
||||
+if (COMMAND cotire)
|
||||
+ set_source_files_properties (IsInf.cpp IsNAN.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
|
||||
+endif()
|
||||
+
|
||||
add_llvm_library(LLVMSupport
|
||||
APFloat.cpp
|
||||
APInt.cpp
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
diff -rupN --exclude=.DS_Store --exclude='*.pyc' llvm-3.5.0.src/CMakeLists.txt llvm-3.5.0.src.cotire/CMakeLists.txt
|
||||
--- llvm-3.5.0.src/CMakeLists.txt 2014-07-04 06:23:26.000000000 +0200
|
||||
+++ llvm-3.5.0.src.cotire/CMakeLists.txt 2014-12-14 12:19:41.000000000 +0100
|
||||
@@ -1,6 +1,6 @@
|
||||
# See docs/CMake.html for instructions about how to build LLVM with CMake.
|
||||
|
||||
-cmake_minimum_required(VERSION 2.8.8)
|
||||
+cmake_minimum_required(VERSION 2.8.12)
|
||||
|
||||
# FIXME: It may be removed when we use 2.8.12.
|
||||
if(CMAKE_VERSION VERSION_LESS 2.8.12)
|
||||
@@ -41,6 +41,8 @@ if ( LLVM_USE_FOLDERS )
|
||||
endif()
|
||||
|
||||
include(VersionFromVCS)
|
||||
+include(cotire)
|
||||
+set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY")
|
||||
|
||||
option(LLVM_APPEND_VC_REV
|
||||
"Append the version control system revision id to LLVM version" OFF)
|
||||
diff -rupN --exclude=.DS_Store --exclude='*.pyc' llvm-3.5.0.src/cmake/modules/AddLLVM.cmake llvm-3.5.0.src.cotire/cmake/modules/AddLLVM.cmake
|
||||
--- llvm-3.5.0.src/cmake/modules/AddLLVM.cmake 2014-07-23 17:19:01.000000000 +0200
|
||||
+++ llvm-3.5.0.src.cotire/cmake/modules/AddLLVM.cmake 2014-12-14 12:28:35.000000000 +0100
|
||||
@@ -106,6 +106,10 @@ function(add_llvm_symbol_exports target_
|
||||
set_property(TARGET ${target_name} APPEND_STRING PROPERTY
|
||||
LINK_FLAGS " /DEF:${CMAKE_CURRENT_BINARY_DIR}/${native_export_file}")
|
||||
endif()
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endif()
|
||||
|
||||
add_custom_target(${target_name}_exports DEPENDS ${native_export_file})
|
||||
@@ -394,6 +398,10 @@ macro(add_llvm_library name)
|
||||
set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
|
||||
endif()
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Libraries")
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endmacro(add_llvm_library name)
|
||||
|
||||
macro(add_llvm_loadable_module name)
|
||||
@@ -422,6 +430,10 @@ macro(add_llvm_loadable_module name)
|
||||
endif()
|
||||
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Loadable modules")
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endmacro(add_llvm_loadable_module name)
|
||||
|
||||
|
||||
@@ -471,6 +483,10 @@ macro(add_llvm_tool name)
|
||||
set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name})
|
||||
endif()
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Tools")
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endmacro(add_llvm_tool name)
|
||||
|
||||
|
||||
@@ -483,12 +499,20 @@ macro(add_llvm_example name)
|
||||
install(TARGETS ${name} RUNTIME DESTINATION examples)
|
||||
endif()
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Examples")
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endmacro(add_llvm_example name)
|
||||
|
||||
|
||||
macro(add_llvm_utility name)
|
||||
add_llvm_executable(${name} ${ARGN})
|
||||
set_target_properties(${name} PROPERTIES FOLDER "Utils")
|
||||
+if (COMMAND cotire)
|
||||
+ set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
|
||||
+ cotire(${name})
|
||||
+endif()
|
||||
endmacro(add_llvm_utility name)
|
||||
|
||||
|
||||
diff -rupN --exclude=.DS_Store --exclude='*.pyc' llvm-3.5.0.src/lib/Support/CMakeLists.txt llvm-3.5.0.src.cotire/lib/Support/CMakeLists.txt
|
||||
--- llvm-3.5.0.src/lib/Support/CMakeLists.txt 2014-07-17 22:05:29.000000000 +0200
|
||||
+++ llvm-3.5.0.src.cotire/lib/Support/CMakeLists.txt 2014-12-14 12:17:10.000000000 +0100
|
||||
@@ -1,3 +1,7 @@
|
||||
+if (COMMAND cotire)
|
||||
+ set_source_files_properties (IsInf.cpp IsNAN.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
|
||||
+endif()
|
||||
+
|
||||
add_llvm_library(LLVMSupport
|
||||
APFloat.cpp
|
||||
APInt.cpp
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
diff -rupN yaml-cpp/CMakeLists.txt yaml-cpp-cotire/CMakeLists.txt
|
||||
--- yaml-cpp/CMakeLists.txt 2012-01-21 09:52:48.000000000 +0100
|
||||
+++ yaml-cpp-cotire/CMakeLists.txt 2012-03-24 17:14:15.000000000 +0100
|
||||
@@ -14,6 +14,7 @@ if(POLICY CMP0015)
|
||||
endif()
|
||||
|
||||
include(CheckCXXCompilerFlag)
|
||||
+include("${CMAKE_SOURCE_DIR}/cotire.cmake")
|
||||
|
||||
|
||||
###
|
||||
@@ -235,6 +236,7 @@ add_library(yaml-cpp
|
||||
${contrib_private_headers}
|
||||
)
|
||||
|
||||
+cotire(yaml-cpp)
|
||||
set_target_properties(yaml-cpp PROPERTIES
|
||||
VERSION "${YAML_CPP_VERSION}"
|
||||
SOVERSION "${YAML_CPP_VERSION_MAJOR}.${YAML_CPP_VERSION_MINOR}"
|
||||
diff -rupN yaml-cpp/test/CMakeLists.txt yaml-cpp-cotire/test/CMakeLists.txt
|
||||
--- yaml-cpp/test/CMakeLists.txt 2012-01-21 09:52:48.000000000 +0100
|
||||
+++ yaml-cpp-cotire/test/CMakeLists.txt 2012-02-19 10:21:36.000000000 +0100
|
||||
@@ -13,3 +13,5 @@ add_executable(run-tests
|
||||
target_link_libraries(run-tests yaml-cpp)
|
||||
|
||||
add_test(yaml-reader-test run-tests)
|
||||
+
|
||||
+cotire(run-tests)
|
||||
\ No newline at end of file
|
||||
diff -rupN yaml-cpp/util/CMakeLists.txt yaml-cpp-cotire/util/CMakeLists.txt
|
||||
--- yaml-cpp/util/CMakeLists.txt 2012-01-21 09:52:48.000000000 +0100
|
||||
+++ yaml-cpp-cotire/util/CMakeLists.txt 2012-02-19 10:21:54.000000000 +0100
|
||||
@@ -1,2 +1,3 @@
|
||||
add_executable(parse parse.cpp)
|
||||
target_link_libraries(parse yaml-cpp)
|
||||
+cotire(parse)
|
||||
\ No newline at end of file
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
diff -rupN zlib-1.2.6/CMakeLists.txt zlib-1.2.6.cotire/CMakeLists.txt
|
||||
--- zlib-1.2.6/CMakeLists.txt 2012-01-17 03:51:23.000000000 +0100
|
||||
+++ zlib-1.2.6.cotire/CMakeLists.txt 2012-03-24 21:08:41.000000000 +0100
|
||||
@@ -7,6 +7,8 @@ if(NOT DEFINED BUILD_SHARED_LIBS)
|
||||
option(BUILD_SHARED_LIBS "Build a shared library form of zlib" ON)
|
||||
endif()
|
||||
|
||||
+include("${CMAKE_SOURCE_DIR}/cotire.cmake")
|
||||
+
|
||||
include(CheckTypeSize)
|
||||
include(CheckFunctionExists)
|
||||
include(CheckIncludeFile)
|
||||
@@ -176,6 +178,10 @@ if(NOT SKIP_INSTALL_FILES AND NOT SKIP_I
|
||||
install(FILES zlib.3 DESTINATION share/man/man3)
|
||||
endif()
|
||||
|
||||
+if (COMMAND cotire)
|
||||
+ cotire(zlib)
|
||||
+endif()
|
||||
+
|
||||
#============================================================================
|
||||
# Example binaries
|
||||
#============================================================================
|
||||
|
|
@ -0,0 +1,137 @@
|
|||
cotire
|
||||
======
|
||||
|
||||
Cotire (compile time reducer) is a CMake module that speeds up the build process of CMake based
|
||||
build systems by fully automating techniques as [precompiled header][pch] usage and
|
||||
[single compilation unit][scu] builds for C and C++.
|
||||
|
||||
features
|
||||
--------
|
||||
|
||||
* Non-intrusive. Requires no source code modification and only minimal changes to CMake list files.
|
||||
* Automatically generates a [single compilation unit][scu] (aka unity source file) for a CMake target.
|
||||
* Automatically generates a [prefix header][pfh] by tracking includes used by a CMake target.
|
||||
* Automatically precompiles prefix header and applies resulting [precompiled header][pch] to a CMake target.
|
||||
* Alternatively, allows for using manually maintained unity source and prefix header files.
|
||||
* Supports C/C++ compilers Clang, GCC, Intel and Visual Studio C++.
|
||||
* Supports mixed language CMake targets.
|
||||
* Supports console (Makefile generator) and IDE (Visual Studio and Xcode) based builds.
|
||||
* Compatible with CMake single build type and CMake multi-configuration builds.
|
||||
* Compatible with most CMake generators (including [Ninja][ninja]).
|
||||
* Supports multi-core unity builds for some generators (make -j, [jom][jom], Visual Studio, Ninja).
|
||||
* Leverages native precompiled header generation features of IDEs (Visual Studio and Xcode).
|
||||
* Compatible with CMake's [cross-compiling][ccrc] support.
|
||||
* Compatible with compiler wrappers like [ccache][ccch].
|
||||
* Applicable to CMake based Qt projects.
|
||||
* Tested with Windows, Linux and OS X.
|
||||
* MIT licensed.
|
||||
|
||||
requirements
|
||||
------------
|
||||
|
||||
* [CMake 2.8.12][cmk] or newer. The executable `cmake` should be on the system path.
|
||||
* [Visual Studio C++][vslstd], [MinGW][mingw] or [Cygwin][cgwn] under Windows.
|
||||
* [GCC][gcc] or [Clang][clang] under Linux or OS X.
|
||||
* [Intel C++ compiler][intel] under Windows, Linux or OS X.
|
||||
* [Xcode][xcdt] application or Xcode Command Line Tools under OS X.
|
||||
|
||||
installation
|
||||
------------
|
||||
|
||||
Copy the file `CMake/cotire.cmake` to the module directory of your CMake project. In the
|
||||
top-level `CMakeList.txt` file, add the module directory to the CMake module search path:
|
||||
|
||||
set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
|
||||
|
||||
usage
|
||||
-----
|
||||
|
||||
To use cotire in your CMake project, add the following include directive to the beginning of the
|
||||
top-level `CMakeList.txt`:
|
||||
|
||||
include(cotire)
|
||||
|
||||
To speed the build process of a CMake library or executable target, just apply the `cotire`
|
||||
function to the target:
|
||||
|
||||
add_executable(MyExecutable ${MyExecutableSources})
|
||||
target_link_libraries(MyExecutable ${MyExecutableLibraries})
|
||||
cotire(MyExecutable)
|
||||
|
||||
Cotire looks at the properties of the target provided by CMake (e.g., target type, source files,
|
||||
compile flags, preprocessor defines, include directories, ...) and sets up custom commands that
|
||||
will generate a unity source file, a prefix header and a precompiled header at build time
|
||||
specially tailored to the target.
|
||||
|
||||
For the generation of the prefix header, cotire will automatically choose headers used by the
|
||||
target that are outside of the project directory and thus are likely to change infrequently.
|
||||
The precompiled prefix header is then applied to the target to speed up the compilation process.
|
||||
|
||||
To use an existing manually maintained prefix header instead of the automatically generated one,
|
||||
set the `COTIRE_CXX_PREFIX_HEADER_INIT` property before invoking cotire:
|
||||
|
||||
set_target_properties(MyExecutable PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "stdafx.h")
|
||||
cotire(MyExecutable)
|
||||
|
||||
As a side effect, cotire generates a new target named `MyExecutable_unity`, which lets you perform
|
||||
a unity build for the original target. The unity target inherits all build settings from the
|
||||
original target, including linked library dependencies.
|
||||
|
||||
For Makefile based generators you can then invoke a unity build that produces the same output as
|
||||
the original target, but does so much faster by entering:
|
||||
|
||||
$ make MyExecutable_unity
|
||||
|
||||
See the advanced usage section of the [cotire manual][manual] for information on how to
|
||||
configure the cotire process (e.g., how to make the unity build use all available processor
|
||||
cores).
|
||||
|
||||
The directory `Patches` contains patch files to enable cotire for some popular open sources
|
||||
packages that use CMake as a build system.
|
||||
|
||||
speedup
|
||||
-------
|
||||
|
||||
Depending on factors like hardware, compiler, the number of files in the target and the complexity
|
||||
of the C/C++ code, the build process of targets that use a cotire generated precompiled header
|
||||
will be sped up from 10 to 40 percent. Using precompiled headers however is not without
|
||||
[issues][PCHH] and may not work for some programs.
|
||||
|
||||
A unity build may be up to 90 percent faster than the one file at a time build of the original
|
||||
target. Single compilation unit builds however are very unlikely to work without source code
|
||||
modifications, because they [break][EoUB] the use of some C and C++ language features.
|
||||
|
||||
Generally, modern C++ code which makes heavy use of header-only libraries will profit the most from
|
||||
cotiring.
|
||||
|
||||
This [blog post][shrp] discusses speedup results obtained for real-world projects.
|
||||
|
||||
known issues
|
||||
------------
|
||||
|
||||
* CMake configure time will increase for cotired targets.
|
||||
* The size of the CMake build folder will increase, because precompiled headers are large binaries.
|
||||
* It is not possible to share precompiled headers generated by cotire between CMake targets.
|
||||
Multiple targets can share a generated prefix header, though (see the [cotire manual][manual]).
|
||||
* Cotire is not compatible with [Xoreax IncrediBuild][XGE].
|
||||
|
||||
[ccch]:https://ccache.samba.org/
|
||||
[ccrc]:https://cmake.org/Wiki/CMake_Cross_Compiling
|
||||
[cgwn]:http://www.cygwin.com/
|
||||
[clang]:http://clang.llvm.org/
|
||||
[cmk]:https://cmake.org/download/
|
||||
[gcc]:https://gcc.gnu.org/
|
||||
[manual]:https://github.com/sakra/cotire/blob/master/MANUAL.md
|
||||
[mingw]:http://www.mingw.org/
|
||||
[ninja]:https://ninja-build.org/
|
||||
[pch]:https://en.wikipedia.org/wiki/Precompiled_header
|
||||
[pfh]:https://en.wikipedia.org/wiki/Prefix_header
|
||||
[scu]:https://en.wikipedia.org/wiki/Single_Compilation_Unit
|
||||
[vslstd]:https://www.visualstudio.com/
|
||||
[xcdt]:https://developer.apple.com/xcode/
|
||||
[PCHH]:https://gcc.gnu.org/wiki/PCHHaters
|
||||
[EoUB]:https://engineering-game-dev.com/2009/12/15/the-evils-of-unity-builds/
|
||||
[jom]:http://wiki.qt.io/Jom
|
||||
[intel]:https://software.intel.com/en-us/c-compilers
|
||||
[XGE]:https://www.incredibuild.com/
|
||||
[shrp]:http://unriskinsight.blogspot.co.at/2014/09/sharpen-your-tools.html
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
Copyright (c) 2012-2017 Sascha Kratky
|
||||
|
||||
Permission is hereby granted, free of charge, to any person
|
||||
obtaining a copy of this software and associated documentation
|
||||
files (the "Software"), to deal in the Software without
|
||||
restriction, including without limitation the rights to use,
|
||||
copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the
|
||||
Software is furnished to do so, subject to the following
|
||||
conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be
|
||||
included in all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
# cotire example project
|
||||
|
||||
add_executable(example main.cpp example.cpp log.cpp log.h example.h)
|
||||
|
||||
# enable warnings
|
||||
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
set_target_properties(example PROPERTIES COMPILE_FLAGS "-Weverything")
|
||||
elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
|
||||
set_target_properties(example PROPERTIES COMPILE_FLAGS "-Wall -Wextra")
|
||||
endif()
|
||||
|
||||
cotire(example)
|
||||
|
||||
# cotire sets the following properties
|
||||
get_target_property(_unitySource example COTIRE_CXX_UNITY_SOURCE)
|
||||
get_target_property(_prefixHeader example COTIRE_CXX_PREFIX_HEADER)
|
||||
get_target_property(_precompiledHeader example COTIRE_CXX_PRECOMPILED_HEADER)
|
||||
get_target_property(_unityTargetName example COTIRE_UNITY_TARGET_NAME)
|
||||
|
||||
if (_unitySource)
|
||||
message(STATUS "example unity source: ${_unitySource}")
|
||||
endif()
|
||||
if (_prefixHeader)
|
||||
message(STATUS "example prefix header: ${_prefixHeader}")
|
||||
endif()
|
||||
if (_precompiledHeader)
|
||||
message(STATUS "example precompiled header: ${_precompiledHeader}")
|
||||
endif()
|
||||
if (TARGET ${_unityTargetName})
|
||||
message(STATUS "example unity target: ${_unityTargetName}")
|
||||
endif()
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
// cotire example project
|
||||
|
||||
#include "example.h"
|
||||
|
||||
#ifndef NDEBUG
|
||||
#include <algorithm>
|
||||
#include <iterator>
|
||||
#endif
|
||||
|
||||
namespace example {
|
||||
|
||||
std::string get_message() {
|
||||
char msg_chrs[] = { 'C', 'o', 't', 'i', 'r', 'e', 'd', '!' };
|
||||
#ifdef NDEBUG
|
||||
return std::string(&msg_chrs[0], &msg_chrs[sizeof(msg_chrs)]);
|
||||
#else
|
||||
std::string msg;
|
||||
msg.reserve(sizeof(msg_chrs));
|
||||
std::copy(msg_chrs, msg_chrs + sizeof(msg_chrs), std::back_inserter(msg));
|
||||
return msg;
|
||||
#endif
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
// cotire example project
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace example {
|
||||
|
||||
std::string get_message();
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
// cotire example project
|
||||
|
||||
#include "log.h"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
namespace logging {
|
||||
|
||||
void error(const std::string& msg) {
|
||||
std::cerr << msg << std::endl;
|
||||
}
|
||||
|
||||
void info(const std::string& msg) {
|
||||
std::cout << msg << std::endl;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
// cotire example project
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace logging {
|
||||
|
||||
void error(const std::string& msg);
|
||||
void info(const std::string& msg);
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
// cotire example project main
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "example.h"
|
||||
#include "log.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
std::string msg = example::get_message();
|
||||
logging::info(msg);
|
||||
}
|
||||
Loading…
Reference in New Issue