summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'CrossCompilingFix13796'Brad King2013-05-161-5/+5
|\ | | | | | | | | efb19b6 CMakeSystem: include toolchain file after setting CMAKE_HOST_ (#13796)
| * CMakeSystem: include toolchain file after setting CMAKE_HOST_ (#13796)Alex Neundorf2013-04-151-5/+5
| | | | | | | | | | | | | | | | | | Make the CMAKE_HOST_* variables always available in the toolchain file. They are when the file is included in CMakeDetermineSystem.cmake, and now also here. For the non-cross-compiling case this does not change anything at all. Alex
* | Merge topic 'fix-comment-typos'Brad King2013-05-161-5/+5
|\ \ | | | | | | | | | | | | 8e0da4c Fix some copyastos in the DetermineRCCompiler file.
| * | Fix some copyastos in the DetermineRCCompiler file.Stephen Kelly2013-04-141-5/+5
| | |
* | | Merge topic 'msbuild-targets-in-subdirs'Brad King2013-05-1647-62/+2042
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ac9a5f4 ctest_build: Pass projectDir to GenerateBuildCommand a6c0299 CTest: Simplify ctest_* command source/build dir lookup 1ca9318 VS: Add test for building MSBuild project in subdir 3cd4000 VS: Use .sln parser to build targets in subdirs with msbuild (#13623) df035e4 VS: Create parser for Visual Studio .sln files de8be9e Add projectDir parameter to GenerateBuildCommand
| * | | ctest_build: Pass projectDir to GenerateBuildCommandPetr Kmoch2013-04-123-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | This allows the ctest_build command's TARGET option to name a target in a subdirectory and still build properly with msbuild. Add test case covering use of ctest_build() with such a TARGET.
| * | | CTest: Simplify ctest_* command source/build dir lookupBrad King2013-04-122-39/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cmCTestHandlerCommand::InitialPass call InitializeHandler after setting the CTest "SourceDirectory" and "BuildDirectory" configuration values instead of before. This makes the values available to InitializeHandler methods in subclasses, so also drop the duplicate configuration of those values from cmCTestConfigureCommand::InitializeHandler.
| * | | VS: Add test for building MSBuild project in subdirPetr Kmoch2013-04-123-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | Add test covering cmGlobalGenerator::GenerateBuildCommand for VS solutions with MSBuild and building a target defined in a subdirectory and not part of ALL.
| * | | VS: Use .sln parser to build targets in subdirs with msbuild (#13623)Petr Kmoch2013-04-121-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | Use cmVisualStudioSlnParser in GenerateBuildCommand() to provide correct command line for MSBuild even when target project is stored in a subdirectory.
| * | | VS: Create parser for Visual Studio .sln filesPetr Kmoch2013-04-1224-0/+1900
| | | | | | | | | | | | | | | | | | | | | | | | Create class cmVisualStudioSlnParser as a generic parser for Visual Studio .sln files. Implement minimum functionality but keep class extensible. Add tests for the class.
| * | | Add projectDir parameter to GenerateBuildCommandPetr Kmoch2013-04-1217-21/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the cmGlobalGenerator::GenerateBuildCommand virtual method signature with a "projectDir" parameter specifying the top of the project build tree for which the build command will be generated. Populate it from call sites in cmGlobalGenerator::Build where a fully-generated build tree should be available.
* | | | Merge topic 'FindOpenSSL-cross-compiling'Brad King2013-05-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 1b614e0 FindOpenSSL: Fix spelling of CMAKE_CROSSCOMPILING (#14075)
| * | | | FindOpenSSL: Fix spelling of CMAKE_CROSSCOMPILING (#14075)Robin Lee2013-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use of the mis-spelled variable name 'CMAKE_CROSS_COMPILING' was introduced by commit 4b793ad1 (FindOpenSSL: find cross-compiled OpenSSL from MinGW, 2012-07-23). Fix the spelling.
* | | | | Merge topic 'vs10-preprocessor-semicolons'Brad King2013-05-163-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4e4688e VS 10: Escape ; as %3B in preprocessor definitions (#14073)
| * | | | | VS 10: Escape ; as %3B in preprocessor definitions (#14073)Brad King2013-04-113-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the suggestion from http://support.microsoft.com/kb/2262855 to escape semicolons in preprocessor definitions for VS >= 10. Update the COMPILE_DEFINITIONS documentation disclaimer list of known limitations accordingly. Update our "Preprocess" test to cover the case. Suggested-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
* | | | | Merge topic 'vs-no-compiler-pdb-setting'Brad King2013-05-168-38/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87c0d16 Ninja: Fix OBJECT_DIR placeholder path conversion fb9f73d MSVC: Invoke 'link' directly for executables 42ba1b0 VS: Separate compiler and linker PDB files (#11899, #14062)
| * | | | | Ninja: Fix OBJECT_DIR placeholder path conversionBrad King2013-04-111-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transform the path using ConvertToNinjaPath just as we do for all other paths. This fixes the OutOfSource test for objects in the ../OutOfBinary directory by computing the proper full path for the /Fd option.
| * | | | | MSVC: Invoke 'link' directly for executablesBrad King2013-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the CMAKE_<LANG>_LINK_EXECUTABLE rule variable to invoke the linker directly instead of through the compiler. We already do this for DLL linking with CMAKE_<LANG>_CREATE_SHARED_LIBRARY. This also works around a VS 6 cl bug. While invoking the link tool internally it fails to correctly quote flags like /pdb:... with spaces in the value.
| * | | | | VS: Separate compiler and linker PDB files (#11899, #14062)Brad King2013-04-057-33/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MS tools create two types of PDB files as explained here: http://msdn.microsoft.com/en-us/library/yd4f8bd1%28v=vs.71%29.aspx http://msdn.microsoft.com/en-us/library/yd4f8bd1%28v=vs.80%29.aspx http://msdn.microsoft.com/en-us/library/yd4f8bd1%28v=vs.90%29.aspx http://msdn.microsoft.com/en-us/library/yd4f8bd1%28v=vs.100%29.aspx One is created by the compiler (/Fd) and the other by the linker (/pdb). The two options should not specify the same file. Split them up. In the VS IDE generators, simply drop ProgramDataBaseFileName to take the VS default "/Fd$(IntDir)vc$(PlatformToolsetVersion).pdb". In the Makefile generators, set "/Fd" on the compile line to be the directory containing object files (with a trailing slash the compiler will add the "vc$(PlatformToolsetVersion).pdb" filename automatically). Drop the /Fd option from the exe link command line and add "/pdb" instead (already done for dll linking). Update these rules for both MSVC and Intel tools. Drop support for PDB_OUTPUT_DIRECTORY and PDB_NAME in STATIC libraries because the generated .pdb files are only from /Fd and not real linker-generated .pdb files. Update documentation to clarify that the PDB_* properties are only for linker .pdb files. This regresses the PDBDirectoryAndName test for STATIC libraries. Since it is not clear at this time what should be done for STATIC library .pdb files, comment out the relevant portion of the test and leave a TODO comment.
* | | | | | Merge topic 'CPackRPM-avoidOwningSystemDirs'Brad King2013-05-161-0/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f055c99 CPackRPM add /usr/lib64 to the list of builtin to-be-excluded path bac5772 CPackRPM add mechanism to remove path from generated list of file in RPM spec.
| * | | | | | CPackRPM add /usr/lib64 to the list of builtin to-be-excluded pathEric NOULARD2013-04-051-2/+2
| | | | | | |
| * | | | | | CPackRPM add mechanism to remove path from generated list of file in RPM spec.Eric NOULARD2013-04-051-0/+42
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bug #0013609, and is a possible solution to #0012864 as well. The later will be completely fixed in another way. Both approaches needs to be implemented because the current one is more automatic. Inspired-By: Ari
* | | | | | Merge topic 'CPackRPM-componentizedUserSpecFile'Brad King2013-05-161-6/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ef908f Add support for componentized USER spec file
| * | | | | | Add support for componentized USER spec fileEric NOULARD2013-04-011-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPACK_RPM_USER_BINARY_SPECFILE can now be specified on a per-component basis using CPACK_RPM_<componentName>_USER_BINARY_SPECFILE. Inspired-By: Theodore Papadopoulo with its patch proposal.
* | | | | | | Merge topic 'cygwin_fd_setsize'Brad King2013-05-165-0/+58
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 875eb8e CTest: Add test for running many tests in parallel
| * | | | | | | CTest: Add test for running many tests in parallelPaul Kunysch2013-03-225-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, this checks that CTest's use of select() has a sufficient file descriptor set size limit (FD_SETSIZE) to handle many child processes at the same time. Running 20 tests requires more than 64 descriptors, the Cygwin default that we override.
* | | | | | | | Begin post-2.8.11 developmentBrad King2013-05-161-2/+2
| | | | | | | |
* | | | | | | | CMake 2.8.11v2.8.11Robert Maynard2013-05-152-1/+5
| | | | | | | |
* | | | | | | | Merge branch 'release'Robert Maynard2013-05-152-3/+645
|\ \ \ \ \ \ \ \
| * | | | | | | | CMake 2.8.11-rc4Robert Maynard2013-05-072-1/+11
| | | | | | | | |
| * | | | | | | | Merge branch 'release'Robert Maynard2013-05-072-3/+635
| |\ \ \ \ \ \ \ \
| | * | | | | | | | CMake 2.8.11-rc3Robert Maynard2013-04-182-1/+12
| | | | | | | | | |
| | * | | | | | | | Merge branch 'release'Robert Maynard2013-04-182-3/+624
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | CMake 2.8.11-rc2Robert Maynard2013-04-052-1/+67
| | | | | | | | | | |
| | | * | | | | | | | Merge branch 'release'Robert Maynard2013-04-052-3/+558
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | | * | | | | | | CMake 2.8.11-rc1Robert Maynard2013-03-142-3/+558
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-05-151-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-05-141-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-05-131-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-05-121-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-05-111-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-05-101-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-05-091-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-05-081-1/+1
|/ / / / / / / / / /
* | | | | | | | | | CMake Nightly Date StampKitware Robot2013-05-071-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'doc-tll-usage-requirements'Brad King2013-05-061-8/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2618e02 target_link_libraries: Update usage requirements documentation
| * | | | | | | | | | target_link_libraries: Update usage requirements documentationBrad King2013-04-301-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-word the documentation to make clear that CMake integrates usage requirements during generation and not synchronously during configuration or execution of target_link_libraries.
* | | | | | | | | | | Merge topic 'fix-per-config-tll-include-dirs'Brad King2013-05-063-23/+54
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dea1df4 Memoize usage requirement include directories in a config-specific map 26dba6a Fix include dir propagation from conditionally linked targets b8259c3 Centralize maintenance of usage requirement include directories
| * | | | | | | | | | | Memoize usage requirement include directories in a config-specific mapStephen Kelly2013-05-061-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 42ebb188 (Memoize includes and defines from interface libraries., 2013-02-22) introduced caching of the includes. Fix the memoization to be configuration-specific so that we do not accumulate entries across multiple evaluations in a multi-config generator.
| * | | | | | | | | | | Fix include dir propagation from conditionally linked targetsStephen Kelly2013-05-061-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generator expressions, including configuration-specific expressions may be used as link libraries of targets. The old-style keywords of target_link_libraries are handled in terms of new generator expressions. However, the generator expressions expect target names to be valid against a regular expression, whereas target_link_libraries does not require validation. In generator expression constructed without any action from the user we need to ensure that only valid expressions are generated. Ensure that strings which are not valid target names are not used in generator expressions which validate the argument. Code like target_link_libraries(B debug A) generates usage requirement references such as "$<$<CONFIG:DEBUG>:A>". When cmTarget::GetIncludeDirectories uses such references it generates expressions like: $<TARGET_PROPERTY:$<$<CONFIG:DEBUG>:A>,INTERFACE_INCLUDE_DIRECTORIES> When the conditions are false such references evaluate as an empty string and the expression fails with an error such as: $<TARGET_PROPERTY:tgt,prop> expression requires a non-empty target name. Fix this by teaching cmTarget::GetIncludeDirectories to wrap the above expression inside a conditional: $<$<BOOL:$<$<CONFIG:DEBUG>:A>>:...> so that $<TARGET_PROPERTY:...> will not be evaluated with an empty target.
generated by cgit v0.12 at 2025-01-10 23:00:55 (GMT)