summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't prepend a path before generator expressions in include_directories.Stephen Kelly2012-09-211-4/+7
|
* Add include guard for cmGeneratorExpression.Stephen Kelly2012-09-211-0/+6
|
* Port remaining code to GetCompileDefinitions().Stephen Kelly2012-09-214-36/+18
|
* Fix indentation in the code blocks generator.Stephen Kelly2012-09-211-43/+41
|
* Revert "Move GenerateTargetManifest to cmGeneratorTarget."Stephen Kelly2012-09-205-79/+76
| | | | | | | | This reverts commit 987e12e2f962b6e9ed9f15f8ff486512911b744e. GenerateTargetManifest is called by the global generator before it creates the generator targets, so we can't move it to cmGeneratorTarget yet.
* Fix compiler warning with initialization order.Stephen Kelly2012-09-191-1/+1
|
* Add convenience for getting a cmGeneratorTarget to use.Stephen Kelly2012-09-192-0/+7
|
* Add a wrapper for accessing config-specific compile-definitions.Stephen Kelly2012-09-195-12/+31
|
* Append the COMPILE_DEFINITIONS from the Makefile to all targets.Stephen Kelly2012-09-194-26/+19
| | | | | | | | This way we don't need to check the definitions from the Makefile when generating later, and can more easily add generator expressions. Duplication is not a problem as the definitions are de-duplicated before generating.
* Move GetIncludeDirectories to cmGeneratorTarget.Stephen Kelly2012-09-1916-52/+68
|
* Port cmLocalGenerator::GetTargetFlags to cmGeneratorTarget.Stephen Kelly2012-09-196-26/+28
|
* Move GetCreateRuleVariable to cmGeneratorTarget.Stephen Kelly2012-09-195-24/+25
|
* Make cmLocalGenerator::AddArchitectureFlags take a cmGeneratorTarget.Stephen Kelly2012-09-1913-49/+56
|
* Move GetLinkInformation to cmGeneratorTargetStephen Kelly2012-09-1913-78/+95
|
* Move GenerateTargetManifest to cmGeneratorTarget.Stephen Kelly2012-09-195-76/+79
|
* Store cmGeneratorTargets with the makefile.Stephen Kelly2012-09-194-6/+24
|
* Add more forwarding API to cmGeneratorTarget.Stephen Kelly2012-09-192-0/+36
| | | | This API is the most commonly required in the following patches.
* Merge topic 'generator-expression-refactor'Brad King2012-09-1921-229/+1388
|\ | | | | | | | | | | 91011bd cmGeneratorExpression: Port users to two-stage processing f1eacf0 cmGeneratorExpression: Re-write for multi-stage evaluation
| * cmGeneratorExpression: Port users to two-stage processingStephen Kelly2012-09-185-56/+95
| | | | | | | | | | | | | | | | | | | | Removing the Process() API and removing the parameters from the constructor will allow cmGeneratorExpressions to be cached and evaluated with multiple configs for example, such as when evaluating target properties. This requires the creation of a new compiled representation of cmGeneratorExpression. The cmListFileBacktrace remains in the constructor so that we can record where a particular generator expression appeared in the CMakeLists file.
| * cmGeneratorExpression: Re-write for multi-stage evaluationStephen Kelly2012-09-1818-201/+1321
| | | | | | | | | | | | | | | | The expressions may be parsed and then cached and evaluated multiple times. They are evaluated lazily so that literals such as ',' can be treated as universal parameter separators, and can be processed from results without appearing literally, and without interfering with the parsing/evaluation of the entire expression.
* | CMake Nightly Date StampKitware Robot2012-09-191-1/+1
| |
* | Merge topic 'findsdl-unlimited-main-13262'David Cole2012-09-181-3/+5
|\ \ | | | | | | | | | | | | adf7058 FindSDL: add SDLMAIN_LIBRARY only once (#13262)
| * | FindSDL: add SDLMAIN_LIBRARY only once (#13262)Rolf Eike Beer2012-09-171-3/+5
| | |
* | | Merge topic 'cleanup-TLS-and-SSL-interface'David Cole2012-09-183-65/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | 7369a8f file(DOWNLOAD): Make TLS options behave as documented 131d91a Rename SSL terminology to TLS
| * | | file(DOWNLOAD): Make TLS options behave as documentedBrad King2012-09-171-33/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic added in commit e1c89f08 (file(DOWNLOAD): Add options for SSL, 2012-08-21) did not actually provide the documented behavior. Simplify the implementation to read the variable values first and then replace them with the explicit argument values if encountered. Always set the curl option CURLOPT_SSL_VERIFYPEER to either on or off explicitly instead of depending on the curl default behavior.
| * | | Rename SSL terminology to TLSBrad King2012-09-143-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | TLS has superseded SSL so rename the recently added file(DOWNLOAD) and ExternalProject options using the newer terminology. Drop "CURLOPT" from names because curl is an implementation detail.
* | | | Merge topic 'ExternalProject-check-hashes'David Cole2012-09-182-50/+77
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | c266461 Add SSL_VERIFYPEER and CAINFO file options to ExternalProject_Add. beb8a83 ExternalProject: Generalize URL_MD5 option to URL_HASH
| * | | Add SSL_VERIFYPEER and CAINFO file options to ExternalProject_Add.Bill Hoffman2012-09-121-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the ability to turn on and off ssl certificate authority checking. It also adds the ability to specify a certificate authority information file. This can be done by setting global cmake variables CMAKE_CURLOPT_CAINFO_FILE and or CMAKE_CURLOPT_SSL_VERIFYPEER in the project calling ExternalProject_Add, or by passing those options to individual ExternalProject_Add calls.
| * | | ExternalProject: Generalize URL_MD5 option to URL_HASHBrad King2012-09-112-50/+48
| | | | | | | | | | | | | | | | Add support for SHA algorithms.
* | | | Merge topic 'vs-simplify-CreateLocalGenerator'David Cole2012-09-186-42/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f34321a VS: Remove duplicated implementations of CreateLocalGenerator()
| * | | | VS: Remove duplicated implementations of CreateLocalGenerator()Patrick Gansterer2012-09-146-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | | The IA64 and Win64 versions of the VS8 and VS9 generators contain the same code for this function as in the base class.
* | | | | Merge topic 'openscenegraph-simplify-fphsa'David Cole2012-09-181-69/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 248db6c FindOpenSceneGraph: simplify by using more features of FPHSA
| * | | | | FindOpenSceneGraph: simplify by using more features of FPHSARolf Eike Beer2012-09-121-69/+11
| | |_|/ / | |/| | |
* | | | | Merge topic 'if-version-depth'David Cole2012-09-182-6/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dfa0ebd if: Compare up to 8 components in VERSION tests
| * | | | | if: Compare up to 8 components in VERSION testsBrad King2012-09-112-6/+17
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the number of components tested by if(... VERSION_LESS ...) if(... VERSION_EQUAL ...) if(... VERSION_GREATER ...) from 4 to 8. The latter is a more extreme maximum.
* | | | | Merge topic 'NewFindGLEWModule'David Cole2012-09-181-0/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fbda7bb Initial version of find module
| * | | | | Initial version of find moduleBenjamin Eikel2012-09-011-0/+30
| | | | | |
* | | | | | Merge topic 'qt5-qtdialog-port'David Cole2012-09-183-99/+117
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25a4f56 Build with Qt5 if it is found. 717f31a Compile with both Qt4 and Qt5. 066e858 Replace two include_directories with a setting. 430ba9f Use add_subdirectory instead of the obsolete subdirs. 32a5725 Remove an if which is always true. 0b6625c Move variable setting down to where it relates to. 8ab312b Use CMake platform variables instead of Qt ones. bd728f6 Add a return-after-error if an old Qt is found.
| * | | | | | Build with Qt5 if it is found.Stephen Kelly2012-08-221-6/+23
| | | | | | |
| * | | | | | Compile with both Qt4 and Qt5.Stephen Kelly2012-08-211-0/+4
| | | | | | |
| * | | | | | Replace two include_directories with a setting.Stephen Kelly2012-08-211-2/+1
| | | | | | |
| * | | | | | Use add_subdirectory instead of the obsolete subdirs.Stephen Kelly2012-08-211-1/+1
| | | | | | |
| * | | | | | Remove an if which is always true.Stephen Kelly2012-08-211-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake based CMake build requires version 2.8.2 as of version 2.8.9.
| * | | | | | Move variable setting down to where it relates to.Stephen Kelly2012-08-211-1/+1
| | | | | | |
| * | | | | | Use CMake platform variables instead of Qt ones.Stephen Kelly2012-08-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt ones no longer exist in Qt 5.
| * | | | | | Add a return-after-error if an old Qt is found.Stephen Kelly2012-08-211-94/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | No need for an else after a return.
* | | | | | | Merge topic 'topics/FindCUDA/Add-CUDA_HOST_COMPILER'David Cole2012-09-182-7/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db207e4 FindCUDA: Added CUDA_HOST_COMPILER variable.
| * | | | | | | FindCUDA: Added CUDA_HOST_COMPILER variable.James Bigler2012-08-202-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new CUDA variable for specifying the CUDA_HOST_COMPILER. This will allow users to be able to specify which host compiler to use for invoking NVCC with. By default it will use the compiler used for host compilation. This is convenient for when you want to specify a different compiler than the default compiler. You end up using the same compiler for both the NVCC compilation and the host compilation instead of using the default compiler in the path for NVCC.
* | | | | | | | CMake Nightly Date StampKitware Robot2012-09-181-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2012-09-171-1/+1
| | | | | | | |