summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'WindowsPaths-MinGW-cross-compile-only'Brad King2013-05-161-2/+4
|\ | | | | | | | | f9eee7f Windows: Search '/' prefix only when cross compiling (#10994)
| * Windows: Search '/' prefix only when cross compiling (#10994)Brad King2013-04-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit dac78148 (...makes the mingw cross compiler work out of the box..., 2007-08-02) added to CMAKE_SYSTEM_PROGRAM_PATH and CMAKE_SYSTEM_LIBRARY_PATH paths like "/bin" and "/lib" with no Windows drive letter so that cross-compiling to Windows from Linux would search these paths under CMAKE_FIND_ROOT_PATH. Later commit 2a782880 (...use CMAKE_SYSTEM_PREFIX_PATH when possible, 2008-01-16) generalized this approach by instead adding "/" to CMAKE_SYSTEM_PREFIX_PATH. Both commits assumed that the paths would never match anything on Windows hosts without a drive letter. However, Windows evaluates these paths relative to the current working drive letter so find_* commands may report paths like "/lib/..." when paths like "c:/lib/..." exist on what happens to be current drive. Such drive-less paths are not reliable when the working drive changes, so we should not use them. Fix WindowsPaths.cmake to add '/' to CMAKE_SYSTEM_PREFIX_PATH only when cross-compiling to Windows from a non-Windows host. This will avoid searching and finding local paths without a drive letter on Windows.
* | Merge topic 'QtDialogSearchText2'Brad King2013-05-163-6/+168
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | f92d7e7 cmake-gui: use shortcut F only for "Find in Output" 6e57724 cmake-gui: Add function for going to next error message in Output window 7be2d8a cmake-gui: Change shortcut of the search field from Ctrl-F to Alt-E 4ce65e8 cmake-gui: Add search functions to the context menu of the Output widget df3663b cmake-gui: Add search functions for Output window (#9733)
| * | cmake-gui: use shortcut F only for "Find in Output"Alex Neundorf2013-04-241-2/+2
| | | | | | | | | | | | | | | | | | Before it was used also for "Find Next" and "Find Previous" Alex
| * | cmake-gui: Add function for going to next error message in Output windowMarc Bartholomaeus2013-04-242-2/+67
| | | | | | | | | | | | | | | | | | Using new shortcuts: F8 (Visual Studio) and Ctrl-. (Eclipse) Signed-off-by: Alex Neundorf <neundorf@kde.org>
| * | cmake-gui: Change shortcut of the search field from Ctrl-F to Alt-EMarc Bartholomaeus2013-04-242-7/+7
| | | | | | | | | | | | | | | | | | Ctrl-F is now used by "Find in Output". Signed-off-by: Alex Neundorf <neundorf@kde.org>
| * | cmake-gui: Add search functions to the context menu of the Output widgetMarc Bartholomaeus2013-04-242-0/+21
| | | | | | | | | | | | Signed-off-by: Alex Neundorf <neundorf@kde.org>
| * | cmake-gui: Add search functions for Output window (#9733)Marc Bartholomaeus2013-04-242-0/+76
| | | | | | | | | | | | Signed-off-by: Alex Neundorf <neundorf@kde.org>
* | | Merge topic 'check-compiler-flag-locale'Brad King2013-05-162-0/+25
|\ \ \ | | | | | | | | | | | | | | | | 5272372 Check{C,CXX}CompilerFlag: Test using C locale (#14102)
| * | | Check{C,CXX}CompilerFlag: Test using C locale (#14102)Brad King2013-04-222-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the locale to C while running the compiler for these checks because we match the resulting warning messages in English only. Suggested-by: Marco Nolden <m.nolden@dkfz-heidelberg.de>
* | | | Merge topic 'Cuda_WRAP_SRCS_duplicates'Brad King2013-05-161-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 32b582d FindCUDA: Remove duplicate entries from INCLUDE_DIRECTORIES.
| * | | | FindCUDA: Remove duplicate entries from INCLUDE_DIRECTORIES.Marcel Loose2013-04-181-0/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | As of CMake 2.8.8, the INCLUDE_DIRECTORIES() command does not de-duplicate entries. Failure to do so can lead to an extremely long and repetitive list of -I entries on the command line.
* | | | Merge topic 'ninja_add_custom_command_windows'Brad King2013-05-161-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e7c58f6 Ninja: use cd /D to set directory on Windows
| * | | | Ninja: use cd /D to set directory on WindowsIan Monroe2013-04-181-1/+6
| |/ / / | | | | | | | | | | | | | | | | Add_custom_command was unable to handle build and source directories existing on different drives.
* | | | Merge topic 'cuda_compute_build_path'Brad King2013-05-161-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cd2d248 FindCUDA: CUDA_COMPUTE_BUILD_PATH uses relative paths to binary dir.
| * | | | FindCUDA: CUDA_COMPUTE_BUILD_PATH uses relative paths to binary dir.Mathias Gaunard2013-04-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make CUDA_COMPUTE_BUILD_PATH use a relative path to the current binary directory instead of the current source directory if the source file considered is in the current binary directory. This is done to shorten the paths given to the compiler.
* | | | | Merge topic 'OpenGL-require-includes'Brad King2013-05-161-91/+88
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5be3593 FindOpenGL: require headers to be found on non-Windows platforms (#13746) b10a171 FindOpenGL: simplify OS selection code
| * | | | | FindOpenGL: require headers to be found on non-Windows platforms (#13746)Rolf Eike Beer2013-04-171-1/+7
| | | | | |
| * | | | | FindOpenGL: simplify OS selection codeRolf Eike Beer2013-04-171-91/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was using nested if's, now it uses elseif to flatten that. It also removes one "if" from the general "else" branch that checks for Apple, as that has it's own branch anyway and can't be true at this point.
* | | | | | Merge topic 'xcode-explicitFileType'Brad King2013-05-164-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5683146 Xcode: Use explicitFileType to mark source types (#14093)
| * | | | | | Xcode: Use explicitFileType to mark source types (#14093)Brad King2013-04-164-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace use of lastKnownFileType with explicitFileType to insist that Xcode treat the file as we ask.
* | | | | | | Merge topic 'improve-get_filename_component-names'Brad King2013-05-1615-208/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d1590e get_filename_component: Add DIRECTORY option (#14091) ec1ba9b get_filename_component: Add explicit unit tests
| * | | | | | | get_filename_component: Add DIRECTORY option (#14091)Brad King2013-04-163-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name "PATH" is not precise so add equivalent option "DIRECTORY". Document the latter as preferred and the former as a legacy alias.
| * | | | | | | get_filename_component: Add explicit unit testsBrad King2013-04-1613-206/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test RunCMake.get_filename_component to cover cases of the command. Remove redundant coverage of these cases from the "complex" tests.
* | | | | | | | Merge topic 'AddIARToolchain2'Brad King2013-05-169-4/+154
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d118b8b Add IAR to the CMakeDetectC(XX)CompilerID.c(pp).in d33f406 Add regexps for the IAR toolchain to the vendor list. 22fb73a Add support files for C, C++ and ASM for the IAR toolchain.
| * | | | | | | | Add IAR to the CMakeDetectC(XX)CompilerID.c(pp).inAlex Neundorf2013-04-152-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the AVR IAR compiler this can't be found, but it works e.g. for the ARM AVR compiler. Alex
| * | | | | | | | Add regexps for the IAR toolchain to the vendor list.Alex Neundorf2013-04-153-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The IAR compilers produce object files where the plain strings at least sometimes can't be found, see: http://www.cmake.org/Bug/view.php?id=10176#c19598 Alex
| * | | | | | | | Add support files for C, C++ and ASM for the IAR toolchain.Alex Neundorf2013-04-154-0/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original feature request is at http://www.cmake.org/Bug/view.php?id=10176 Documentation can be found at http://www.iar.com/website1/1.0.1.0/675/1/ Alex
* | | | | | | | | 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