summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Tests: Use consistent C++ flags FindPackageModeMakefileTestBrad King2015-10-011-2/+3
| |/ / | | | | | | | | | | | | | | | | | | Rather than using the CXXFLAGS environment variable in the make-only build, copy the CMAKE_CXX_FLAGS used to build the files on the CMake side. This will account for any changes made by CompileFlags.cmake or cache-provided flags.
* | | Merge topic 'test-VSGNUFortran-oracle-link'Brad King2015-10-021-3/+3
|\ \ \ | | | | | | | | | | | | | | | | 7bc202cc Tests: Simplify VSGNUFortran Oracle-specific link lines
| * | | Tests: Simplify VSGNUFortran Oracle-specific link linesBrad King2015-10-011-3/+3
| |/ / | | | | | | | | | | | | | | | | | | On an Oracle 12.4 build the c_using_fortran executable cannot find the "fsu" library at runtime. Since this is an implementation detail of the "hello" library, link that library to it privately so that "-lfsu" does not propagate to the executables consuming it.
* | | Merge topic 'cpack-tests-fix'Brad King2015-10-023-48/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1b13af46 Tests: Fix RunCMake.CPack_* tests to use proper CMake generator 981068b7 Tests: Avoid OS X 10.5 limitation warning in RunCMake.CPack* tests e8954d0b Tests: Add trailing newlines to generated sources in RunCMake.CPack_* tests
| * | | Tests: Fix RunCMake.CPack_* tests to use proper CMake generatorDomen Vrankar2015-10-012-45/+3
| | | | | | | | | | | | | | | | | | | | | | | | Use the run_cmake() function to generate the test build tree with the proper CMake generator and also to verify that it succeeds. Drop our PreTestError helper as it is no longer needed.
| * | | Tests: Avoid OS X 10.5 limitation warning in RunCMake.CPack* testsBrad King2015-10-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DEPENDENCIES test case uses install(TARGETS) and so generates a warning: CMake Warning in CMakeLists.txt: WARNING: Target "test_prog" has runtime paths which cannot be changed during install. To change runtime paths, OS X version 10.6 or newer is required. Therefore, runtime paths will not be changed when installing. CMAKE_BUILD_WITH_INSTALL_RPATH may be used to work around this limitation. Set CMAKE_BUILD_WITH_INSTALL_RPATH to avoid the warning since we do not need to run the binaries from the build tree anyway.
| * | | Tests: Add trailing newlines to generated sources in RunCMake.CPack_* testsBrad King2015-10-011-3/+3
| | | | | | | | | | | | | | | | This avoids compiler warnings on stderr while building them.
* | | | Merge topic 'release-binaries-windows-cmake-path'Brad King2015-10-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | ec725815 Utilities/Release: Update path to 'cmake.exe' on Windows build machine
| * | | | Utilities/Release: Update path to 'cmake.exe' on Windows build machineBrad King2015-10-011-1/+1
| | | | |
* | | | | Merge topic 'vs-win10-sdk'Brad King2015-10-0212-3/+148
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 3f077996 VS: Add support for selecting the Windows 10 SDK (#15670) 5dfc4c5f VS: Add hook to initialize Windows platform settings 61c472a2 cmSystemTools: Add VersionCompareGreater helper
| * | | | VS: Add support for selecting the Windows 10 SDK (#15670)Gilles Khouzam2015-10-029-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the VS 2015 generator to produce a WindowsTargetPlatformVersion value. Use the CMAKE_SYSTEM_VERSION to specify the version and if not set choose a default based on available SDKs. Activate this behavior when targeting Windows 10. Co-Author: Brad King <brad.king@kitware.com>
| * | | | VS: Add hook to initialize Windows platform settingsGilles Khouzam2015-10-022-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Give VS 10+ generators a chance to choose Windows platform settings just as they already can for WindowsCE, WindowsStore, and WindowsPhone.
| * | | | cmSystemTools: Add VersionCompareGreater helperGilles Khouzam2015-10-022-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Wrap a call to VersionCompare with OP_GREATER in a signature suitable for use with std::sort.
* | | | | Merge topic 'explicit-system-version'Brad King2015-10-023-9/+43
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | b31ac171 Allow CMAKE_SYSTEM_VERSION to be set without CMAKE_SYSTEM_NAME 70688609 Help: Improve CMAKE_SYSTEM_{NAME,VERSION} variable documentation
| * | | | Allow CMAKE_SYSTEM_VERSION to be set without CMAKE_SYSTEM_NAMEGilles Khouzam2015-10-022-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach CMakeDetermineSystem to check for a CMAKE_SYSTEM_VERSION setting even when CMAKE_SYSTEM_NAME is not set. This will allow builds on the host OS to target other versions of the OS without full cross-compiling.
| * | | | Help: Improve CMAKE_SYSTEM_{NAME,VERSION} variable documentationBrad King2015-10-022-8/+33
| | |/ / | |/| | | | | | | | | | | | | | Specify their meaning for host builds and when cross compiling. Sepcify their relationship in each case.
* | | | CMake Nightly Date StampKitware Robot2015-10-021-1/+1
| |/ / |/| |
* | | Merge topic 'compiler-links-statically'Brad King2015-10-018-1/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | 8b4873a1 Disable shared library support when compiler links statically e90f463a Drop executable symbol export if platform does not support shared libs
| * | | Disable shared library support when compiler links staticallyBrad King2015-09-307-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user or a compiler wrapper adds '-static' to the compiler flags then it will always link static binaries. Detect this from the compiler id binary and disable TARGET_SUPPORTS_SHARED_LIBS. This will prevent projects from accidentally adding shared libraries when the toolchain does not support them. It also helps CMake avoid linking with flags that require shared libraries to be supported.
| * | | Drop executable symbol export if platform does not support shared libsChuck Atkins2015-09-301-1/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | Instead of always adding CMAKE_SHARED_LIBRARY_LINK_<LANG>_FLAGS to executables, or just when the ENABLE_EXPORTS property is set (CMP0065), make sure that the target platform also actually supports shared libraries. If not, then the executable cannot possibly provide symbols to them anyway.
* | | Merge topic 'fix-warnings'Brad King2015-10-012-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | f90acf52 cmVisualStudio10TargetGenerator: Fix unsigned integer constant type e67e0155 cmMakefile: Avoid name conflict with Solaris global typedef
| * | | cmVisualStudio10TargetGenerator: Fix unsigned integer constant typeBrad King2015-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | Add a 'u' suffix to FILETIME component integer constant initializers. This avoids warnings about the range of the signed constant value.
| * | | cmMakefile: Avoid name conflict with Solaris global typedefBrad King2015-09-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Solaris there is a global typedef called 'single': /usr/include/floatingpoint.h:77:15: note: shadowed declaration is here typedef float single; Avoid shadowing it by using a different name.
* | | | CMake Nightly Date StampKitware Robot2015-10-011-1/+1
| |/ / |/| |
* | | Merge topic 'FindOpenSSL-imported-targets'Brad King2015-09-301-0/+4
|\ \ \ | | | | | | | | | | | | | | | | 0429c384 Help: Add notes for topic 'FindOpenSSL-imported-targets'
| * | | Help: Add notes for topic 'FindOpenSSL-imported-targets'Konstantin Podsvirov2015-09-291-0/+4
| | | |
* | | | Merge topic 'update-kwsys'Brad King2015-09-302-1/+65
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | def90d5f Merge branch 'upstream-kwsys' into update-kwsys cc144ebf KWSys 2015-09-28 (2089567a)
| * | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-09-292-1/+65
| |\ \ \ | | |_|/ | |/| |
| | * | KWSys 2015-09-28 (2089567a)KWSys Robot2015-09-292-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 2089567a | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' dc4e4a55..2089567a Vitaly Baranov (1): 2089567a SystemTools: Fix GetPath to not affect existing output vector entries
* | | | CMake Nightly Date StampKitware Robot2015-09-301-1/+1
|/ / /
* | | Merge topic 'vs-old-rule-files'Brad King2015-09-292-0/+29
|\ \ \ | | | | | | | | | | | | | | | | fa5284f0 VS: Prevent generated "rule" files from causing rebuilds
| * | | VS: Prevent generated "rule" files from causing rebuildsMike Pagel2015-09-282-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | When we generate a ".rule" file to attach a custom command in a VS IDE project, set the file timestamp to be old enough to prevent the rule from re-running due to its timestamp.
* | | | Merge topic 'fix-qtautogen-with-object-library-Ninja'Brad King2015-09-295-17/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9bc6eb8e cmGlobalGenerator: Initialize generator targets on construction (#15729)
| * | | | cmGlobalGenerator: Initialize generator targets on construction (#15729)Stephen Kelly2015-09-295-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja generator and Visual Studio generators are special-cased for the QtAutogen feature. In order to reduce the number of custom targets, the Visual Studio generators prefer to create custom commands instead, and in order to create appropriate Ninja files, generated rcc files are listed as byproducts. This requires the use of the GetConfigCommonSourceFiles API of the cmGeneratorTarget for those generators when initializing the autogen target. The initializer method is called from Compute() after the cmGeneratorTarget objects are created, however the initialization of the object directory occurs later in the InitGeneratorTargets method. That means that the resulting object locations are computed incorrectly and cached before the object directory is determined, so the generated buildsystem can not find the object files. The initialization of the object directory was split from the creation of cmGeneratorTarget instances in commit 0e0258c8 (cmGlobalGenerator: Split creation of generator object from initialization., 2015-07-25). The motivation for the split was to do only what is essential to do early in cases where cmGeneratorTargets need to be created at configure-time. That is required for the purpose of implementing policies CMP0024 and CMP0026, and for try_compile(LINK_LIBRARIES). However, the split was not really necessary. Compute the object directory in the cmGeneratorTarget constructor instead. The QtAutogen unit test already tests the use of TARGET_OBJECTS with AUTOMOC, and that test already passes on Ninja. The reason it already passes is that the QtAutogen target also uses the AUTORCC feature, and specifies several qrc files in its SOURCES. Later in the Compute algorithm (after the InitGeneratorTargets call), the rcc files are determined and target->AddSource is called. The AddSource call clears the previously mentioned cache of source files, causing it to be regenerated when next queried, this time taking account of the object directory. Extend the test suite with a new target which does not make use of AUTORCC with qrc files so that the test added alone would break without the fix in this commit.
* | | | | Merge topic 'simplify-qt-autogen'Brad King2015-09-297-1107/+1208
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1fe39020 QtAutogen: Port away from cmLocalGenerator. 59a729b2 QtAutogen: Split initializer class into separate file. 1e83a963 QtAutogen: Split initializer methods into separate class. 12f0e13c QtAutogen: Simplify generator initialization API. 65ff75d3 QtAutogen: Remove unnecessary dereference. 64b78c14 QtAutogen: Move Source initialization to prior loop. c3c20d3c QtAutogen: Add _automoc.cpp sources before initializing. 8b6ec29d QtAutogen: Move initialization condition to caller. 9470b056 QtAutogen: Move condition to prior loop. b7491b1c QtAutogen: Move condition to prior loop. e791c854 QtAutogen: Make some methods static. 6210ec64 QtAutogen: Make internal method private. a3ceb998 QtAutogen: Don't use members to initialize automoc targets. dced2fe1 QtAutogen: Rename variable. f9a77e76 QtAutogen: Don't use a member to store skipped uic files. c3633e7a QtAutogen: Add missing includes and forward declarations.
| * | | | QtAutogen: Port away from cmLocalGenerator.Stephen Kelly2015-09-291-8/+7
| | | | |
| * | | | QtAutogen: Split initializer class into separate file.Stephen Kelly2015-09-296-1091/+1152
| | | | |
| * | | | QtAutogen: Split initializer methods into separate class.Stephen Kelly2015-09-263-40/+55
| | | | |
| * | | | QtAutogen: Simplify generator initialization API.Stephen Kelly2015-09-262-14/+12
| | | | |
| * | | | QtAutogen: Remove unnecessary dereference.Stephen Kelly2015-09-261-3/+3
| | | | |
| * | | | QtAutogen: Move Source initialization to prior loop.Stephen Kelly2015-09-261-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that all targets have their _automoc.cpp before attempting to initialize the autogen target. The initialization evaluates generator expressions for target sources, and must include the _automoc.cpp of object library dependents in order for TARGET_OBJECTS to include the object file for the corresponding _automoc.cpp file.
| * | | | QtAutogen: Add _automoc.cpp sources before initializing.Stephen Kelly2015-09-263-2/+17
| | | | |
| * | | | QtAutogen: Move initialization condition to caller.Stephen Kelly2015-09-263-20/+18
| | | | |
| * | | | QtAutogen: Move condition to prior loop.Stephen Kelly2015-09-261-10/+12
| | | | |
| * | | | QtAutogen: Move condition to prior loop.Stephen Kelly2015-09-261-15/+16
| | | | |
| * | | | QtAutogen: Make some methods static.Stephen Kelly2015-09-263-26/+29
| | | | |
| * | | | QtAutogen: Make internal method private.Stephen Kelly2015-09-261-1/+2
| | | | |
| * | | | QtAutogen: Don't use members to initialize automoc targets.Stephen Kelly2015-09-262-19/+22
| | | | |
| * | | | QtAutogen: Rename variable.Stephen Kelly2015-09-261-2/+3
| | | | |
| * | | | QtAutogen: Don't use a member to store skipped uic files.Stephen Kelly2015-09-262-12/+12
| | | | |