summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2014-07-021-1/+1
|
* Merge topic 'test-speedup-RunCMake.include_directories'Brad King2014-07-0119-44/+55
|\ | | | | | | | | | | | | | | 9998d78d Tests: Speed up RunCMake.include_directories test 6eee5d74 Tests: Drop broken and now unused RunCMake_TEST_FILE option f0f15b93 Tests: Refactor RunCMake.include_directories to drop RunCMake_TEST_FILE 8707814e Tests: Refactor RunCMake.File_Generate to drop RunCMake_TEST_FILE
| * Tests: Speed up RunCMake.include_directories testBrad King2014-06-3011-11/+11
| | | | | | | | | | | | Remove unnecessary language initializations. Change the main CMakeLists.txt project() call to specify NONE. Use enable_language(CXX) instead of project() in cases that need it to avoid enabling C too.
| * Tests: Drop broken and now unused RunCMake_TEST_FILE optionBrad King2014-06-301-4/+1
| | | | | | | | | | | | | | We cannot use -DRunCMake_TEST=${RunCMake_TEST_FILE} because test cases use project(${RunCMake_TEST}) and the project name cannot be a path to a file. The parent and grandparent commits removed the only uses of the option. Drop it now.
| * Tests: Refactor RunCMake.include_directories to drop RunCMake_TEST_FILEBrad King2014-06-304-24/+35
| | | | | | | | | | Drop use of RunCMake_TEST_FILE and pass the test file in through a definition in RunCMake_TEST_OPTIONS.
| * Tests: Refactor RunCMake.File_Generate to drop RunCMake_TEST_FILEBrad King2014-06-304-5/+8
| | | | | | | | | | Drop use of RunCMake_TEST_FILE and pass the test file in through a definition in RunCMake_TEST_OPTIONS.
* | Merge topic 'ninja-no-phony-sources'Brad King2014-07-014-44/+44
|\ \ | | | | | | | | | | | | | | | | | | 93371ed5 Ninja: Skip generating empty phony rules 7243c951 Ninja: Don't limit custom cmd side-effects to build folder (#14972) a33cf6d0 Ninja: Consider only custom commands deps as side-effects (#14972)
| * | Ninja: Skip generating empty phony rulesAdam Strzelecki2014-06-302-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja generator ensures that all custom commands being target dependencies are run before other source compilations. However in case there are no such dependencies it currently generates empty phony rules which clutter the build graph. Teach the Ninja generator to produce such rules only when necessary.
| * | Ninja: Don't limit custom cmd side-effects to build folder (#14972)Adam Strzelecki2014-06-301-16/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually custom command can write wherever it wants to, such as temporary folder or source folder, possibly violating rules that only build folder should be affected. Therefore we should consider custom command dependency at any path as possible side effect adding phony rule. We avoid adding phony rules for regular source files (since the paraent commit) so we no longer need the in-build-tree test to avoid them.
| * | Ninja: Consider only custom commands deps as side-effects (#14972)Adam Strzelecki2014-06-302-14/+17
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.12~248^2 (Ninja: Custom Command file depends don't need to exist before building, 2013-06-07) all explicit dependencies inside build folder were considered as possible build command side-effects and phony rules were produced for them in case they don't exist when starting to build. This is unnecessary since regular compile inputs need to exist or cmake will fail. Moreover the exception for sources having GENERATED property that can be missing is already handled by WriteAssumedSourceDependencies. This fixes unwanted phony rules for all regular source files when doing in-source build, causing Ninja not complain when such files gets missing, i.e. during development. Also this reduces number of rules in ninja.build. Now only custom command dependencies are considered as possible side-effects.
* | Merge topic 'cuda_osx_clang'Brad King2014-07-012-4/+14
|\ \ | | | | | | | | | | | | 32bcec5f FindCUDA: Fix OSX Clang & no C language enabled
| * | FindCUDA: Fix OSX Clang & no C language enabledAdam Strzelecki2014-06-302-4/+14
| |/ | | | | | | | | | | | | | | | | | | | | When setting default CUDA_HOST_COMPILER we must dereference CMAKE_C_COMPILER, i.e. /usr/bin/clang should be used instead /usr/bin/cc which is symlink. Otherwise CUDA thinks it is GCC and issues -dumpspecs which is unknown option to Clang. Also in case neither CMAKE_C_COMPILER is defined (project does not use C language) nor CUDA_HOST_COMPILER is specified manually we should skip -ccbin and let nvcc use its own default C compiler.
* | Merge topic 'FindVTK-drop-4.0-support'Brad King2014-07-012-101/+17
|\ \ | | | | | | | | | | | | 117e7e11 FindVTK: Drop support for finding VTK 4.0
| * | FindVTK: Drop support for finding VTK 4.0Brad King2014-07-012-101/+17
| |/ | | | | | | | | Convert to a simple thin-wrapper around the find_package(VTK NO_MODULE). This makes the code much simpler and improves error messages.
* | CMake Nightly Date StampKitware Robot2014-07-011-1/+1
| |
* | Merge topic 'FindQt4-ignore-qt5'Brad King2014-06-301-1/+2
|\ \ | | | | | | | | | | | | 567d4d8d FindQt4: Don't further process qmake if it does not belong to Qt4
| * | FindQt4: Don't further process qmake if it does not belong to Qt4Nils Gladitz2014-06-271-1/+2
| | | | | | | | | | | | | | | | | | If the only qmake that can be found belongs to Qt5 the find module would otherwise still further interrogate it and issue diagnostics which are specific to Qt4.
* | | Merge topic 'vs14-generator'Brad King2014-06-3030-55/+968
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0e298ad Help: Add notes for topic 'vs14-generator' 5c105140 Tests: Simplify LoadCommand tests b1cbd577 FindBoost: Add -vc140 mangling for VS 14 bdc7d9c8 VS14: Fix Cl and Link flag tables as previous versions d96b3f68 VS14: Generate flag tables from MSBuild v140 tool files 65624c39 VS14: Add Visual Studio 14 generator (#14982) 8635ac23 Tests/Preprocess: Remove unnecessary VS version tests
| * | | Help: Add notes for topic 'vs14-generator'Brad King2014-06-271-0/+4
| | | |
| * | | Tests: Simplify LoadCommand testsBrad King2014-06-256-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | Drop out-of-place coverage of CheckFunctionExists module. The "printf" symbol is not available on VS 14 without including the <stdio.h> header to get a definition.
| * | | FindBoost: Add -vc140 mangling for VS 14Brad King2014-06-251-0/+2
| | | | | | | | | | | | | | | | Co-Author: Pawel Stopinski <diokhan@go2.pl>
| * | | VS14: Fix Cl and Link flag tables as previous versionsBrad King2014-06-252-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the flag table fixes from: commit 9c7f234c (VS: Fix /MANIFESTUAC:NO linker option mapping, 2014-05-07) commit e8633e66 (VS: Fix /analyze:log flag mapping, 2014-04-01) commit f2caf795 (VS: Fix /MAP:mapfile flag mapping, 2013-07-09) to the VS 14 flag tables.
| * | | VS14: Generate flag tables from MSBuild v140 tool filesBrad King2014-06-255-3/+759
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run cmparseMSBuildXML.py on cl.xml, lib.xml, and link.xml to generate our flag tables: python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/V140/1033/cl.xml" > cmVS14CLFlagTable.h python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/V140/1033/lib.xml" > cmVS14LibFlagTable.h python cmparseMSBuildXML.py -x ".../MSBuild/Microsoft.Cpp/v4.0/V140/1033/link.xml" > cmVS14LinkFlagTable.h Fix up the declaration names at the top of each file. Finally, teach cmVisualStudio10TargetGenerator to select the version of the table matching the version of VS. Co-Author: Pawel Stopinski <diokhan@go2.pl>
| * | | VS14: Add Visual Studio 14 generator (#14982)Brad King2014-06-2516-9/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call the generator "Visual Studio 14" without any year because this version of VS does not provide a year in the product name. Copy cmGlobalVisualStudio12Generator to cmGlobalVisualStudio14Generator and update version numbers accordingly. Add the VS14 enumeration value. Teach the platform module Windows-MSVC to set MSVC14 and document the variable. Teach module InstallRequiredSystemLibraries to look for the VS 14 runtime libraries. Teach tests CheckCompilerRelatedVariables, VSExternalInclude, and RunCMake.GeneratorToolset to treat VS 14 as they do VS 10, 11, and 12. Co-Author: Pawel Stopinski <diokhan@go2.pl>
| * | | Tests/Preprocess: Remove unnecessary VS version testsBrad King2014-06-241-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.12~436^2 (VS 10: Escape ; as %3B in preprocessor definitions, 2013-04-11) the Tests/Preprocessor/CMakeLists.txt file no longer uses the PP_VS1XX values, so stop setting them.
* | | | Merge topic 'FindOpenMP-intel-qopenmp'Brad King2014-06-301-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4671f3ab FindOpenMP: ICC 15 deprecates -openmp, use -qopenmp
| * | | | FindOpenMP: ICC 15 deprecates -openmp, use -qopenmpAdam Strzelecki2014-06-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Intel Composer XE 2015 Beta 2 deprecates all options starting with -o for sake of compatibility with other compilers expecting anything goes after -o... is output file name.
* | | | | Merge topic 'FindJPEG-new-windows-name'Brad King2014-06-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 115811dc FindJPEG: Add alternative name 'libjpeg'
| * | | | | FindJPEG: Add alternative name 'libjpeg'Sebastian Elsner2014-06-271-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Newer versions of jpeglib build the .lib file on Windows with a different name by default. Its now called libjpeg.lib instead of jpeg.lib.
* | | | | CMake Nightly Date StampKitware Robot2014-06-301-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-06-291-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-06-281-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'release'Brad King2014-06-270-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'UseSWIG-fix-noproxy-check' into releaseBrad King2014-06-251-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'bootstrap-cmake-locations' into releaseBrad King2014-06-252-4/+12
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'UseSWIG-fix-noproxy-check'Brad King2014-06-271-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | e932ac9c UseSWIG: Fix check for noproxy flag (#14990)
| * | | | | | UseSWIG: Fix check for noproxy flag (#14990)Brad King2014-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for this flag added by commit v3.0.0-rc1~284^2 (UseSWIG: Name python module according to swig flags, 2013-11-26) can get false positives on flags like "-noproxydel". Improve the check to match only "-noproxy". Suggested-by: Garth Wells <gnw20@cam.ac.uk>
* | | | | | | Merge topic 'bootstrap-cmake-locations'Brad King2014-06-272-4/+12
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 6650b0fa bootstrap: Fix "make test" and "make package" targets (#14989) bc151757 bootstrap: Clarify name of configured source directory
| * | | | | | bootstrap: Fix "make test" and "make package" targets (#14989)Brad King2014-06-252-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc1~374^2 (Refactor internal resource location APIs and initialization, 2013-11-07) a bootstrap-built "cmake" tries to reference "ctest" and "cpack" executables next to itself, which never exist. Teach cmSystemTools::FindCMakeResources, when bootstrap-built, to refer to the "ctest" and "cpack" executables in the location where they will be built after "make".
| * | | | | | bootstrap: Clarify name of configured source directoryBrad King2014-06-252-4/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Rename CMAKE_ROOT_DIR to CMAKE_BOOTSTRAP_SOURCE_DIR to clarify both that it is only for bootstrap and that it refers to the source directory.
* | | | | | Merge topic 'CTestTestTimeout-increase'Brad King2014-06-271-5/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a73373a8 CTestTestTimeout: increase the timeout for all platforms
| * | | | | | CTestTestTimeout: increase the timeout for all platformsRolf Eike Beer2014-06-251-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slow or busy machines not running Cygwin may also fail the 1 second timeout: CMake Error at CTestTestTimeout/test.cmake:38 (message): Log does not exist: .../Tests/CTestTestTimeout/timeout.log http://open.cdash.org/testDetails.php?test=264045338&build=3382733 http://open.cdash.org/testDetails.php?test=263904235&build=3382056
* | | | | | | Merge topic 'refactor-link-internals'Brad King2014-06-272-168/+160
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24637979 cmTarget: Refactor ComputeLinkImplementation 7812d2a9 cmTarget: Pre-indent a block in ComputeLinkImplementation f48d8bd6 cmTarget: Shorten a long line in ComputeLinkImplementation 7b0834e9 cmTarget: Refactor internal LinkImplementation map b8651d97 cmTarget: Remove unnecessary 'mutable' markup 0192be51 cmTarget: De-duplicate link interface evaluation for $<LINK_ONLY> 6ead631b cmTarget: Teach GetLinkInterfaceLibraries to support $<LINK_ONLY> b030a7f1 cmTarget: De-duplicate link interface genex code for $<LINK_ONLY> 1001490d cmTarget: Teach ExpandLinkItems how to support $<LINK_ONLY>
| * | | | | | | cmTarget: Refactor ComputeLinkImplementationBrad King2014-06-251-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use LinkImplementationPropertyEntries directly instead of asking GetProperty to construct a string for LINK_LIBRARIES. This gives us access to the entry backtraces.
| * | | | | | | cmTarget: Pre-indent a block in ComputeLinkImplementationBrad King2014-06-251-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare to move it into another block without extra whitespace changes.
| * | | | | | | cmTarget: Shorten a long line in ComputeLinkImplementationBrad King2014-06-251-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare to change its indentation without exceeding line length limit.
| * | | | | | | cmTarget: Refactor internal LinkImplementation mapBrad King2014-06-251-31/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If ComputeLinkImplementationLanguages were ever to cause GetLinkImplementationLibraries to be invoked then a LinkImplMap entry may appear in the middle of computing it in GetLinkInformation. Instead create the map entry up front and store in it boolean values indicating which pieces of the LinkImplementation structure have been populated. This approach leads to shorter code that is easier to follow too.
| * | | | | | | cmTarget: Remove unnecessary 'mutable' markupBrad King2014-06-251-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Members of the cmTargetInternals structure do not need to be made 'mutable' even to cache data because there is no reason for the internal methods to be 'const'.
| * | | | | | | cmTarget: De-duplicate link interface evaluation for $<LINK_ONLY>Brad King2014-06-251-32/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach GetTransitivePropertyTargets to use the GetLinkInterfaceLibraries method with usage_requirements_only==true instead of evaluating the INTERFACE_LINK_LIBRARIES property directly. This avoids duplicate evaluations and makes use of the caching done by GetLinkInterfaceLibraries.
| * | | | | | | cmTarget: Teach GetLinkInterfaceLibraries to support $<LINK_ONLY>Brad King2014-06-252-26/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a 'usage_requirements_only' parameter to GetLinkInterfaceLibraries and supporting internal APIs to pass through to ExpandLinkItems so it knows whether to use SetTransitivePropertiesOnly while evaluating generator expressions.
generated by cgit v0.12 at 2025-01-08 20:03:29 (GMT)