summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* if: Add test for IS_DIRECTORYBrad King2013-05-287-0/+25
| | | | | | Add a RunCMake.if test to cover if() command behavior. Start with a test for IS_DIRECTORY cases with an existing directory and a long path, both with a trailing slash.
* Merge branch 'master' into fix-FileIsDirectory-SEGVBrad King2013-05-28118-463/+3411
|\ | | | | | | | | Resolve conflict in Source/kwsys/SystemTools.cxx by combining the two changes.
| * Merge topic 'update-kwsys'Brad King2013-05-166-14/+14
| |\ | | | | | | | | | | | | | | | | | | | | | b7593bf Merge branch 'upstream-kwsys' into update-kwsys d0cdc68 KWSys 2013-05-06 (f4928d44) 0c04428 Merge branch 'upstream-kwsys' into update-kwsys 327c982 KWSys 2013-04-25 (709fb5c1)
| | * Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-05-076-12/+12
| | |\
| | | * KWSys 2013-05-06 (f4928d44)KWSys Robot2013-05-076-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ f4928d44 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 709fb5c1..f4928d44 Andreas Mohr (1): f4928d44 Fix spelling and typos in comments and method documentation Change-Id: I64109c176370a9f10a22da21bc81bd9306a80431
| | * | Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-04-261-2/+2
| | |\ \ | | | |/
| | | * KWSys 2013-04-25 (709fb5c1)KWSys Robot2013-04-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 709fb5c1 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 2d263bc3..709fb5c1 Brad King (1): 709fb5c1 SystemTools: Fix FileIsDirectory for Windows drive letter roots Change-Id: Ie71305c3787806599f79a3cc7096e74e7237e986
| * | | Merge topic 'fix-per-config-tll-include-dirs'Brad King2013-05-163-0/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 88308bc Test that linking using the debug keyword to tll works. 20104ab Test transitive includes from setting the LINK_LIBRARIES property.
| | * | | Test that linking using the debug keyword to tll works.Stephen Kelly2013-05-161-0/+8
| | | | |
| | * | | Test transitive includes from setting the LINK_LIBRARIES property.Stephen Kelly2013-05-062-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit b8259c3d (Centralize maintenance of usage requirement include directories, 2013-04-29) changed the handling of the property. Previously setting the property directly instead of via target_link_libraries would not result in transitive include directory handling.
| * | | | Merge topic 'ExternalProject-svn-auth-blank'Brad King2013-05-161-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ecd11a2 ExternalProject: Allow blank SVN_USERNAME/SVN_PASSWORD (#14128)
| | * | | | ExternalProject: Allow blank SVN_USERNAME/SVN_PASSWORD (#14128)Matt McCormick2013-05-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With SVN_USERNAME "" SVN_PASSWORD "" in an ExternalProject_Add() call, the blank username and password will be passed to the svn checkout/update step commands.
| * | | | | Merge topic 'implicit-linker-detection'Brad King2013-05-161-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a2bc47d Recognize ld with toolchain prefix (#13960)
| | * | | | | Recognize ld with toolchain prefix (#13960)Brad King2013-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach CMAKE_PARSE_IMPLICIT_LINK_INFO to recognize linker invocations of the form "<toolchain-prefix>-ld" e.g. "x86_64-pc-linux-gnu-ld".
| * | | | | | Merge topic 'cpack-nsis-uninstall'Brad King2013-05-161-1/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40566ef CPack/NSIS: Obtain path from which to uninstall from registry (#14124)
| | * | | | | | CPack/NSIS: Obtain path from which to uninstall from registry (#14124)David Golub2013-05-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, when CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL is set, the installer tries to uninstall the old version from the default installation path for the new version, rather than using the path from the registry where the old version is installed.
| * | | | | | | Merge topic 'eclipse-doc-typo'Brad King2013-05-161-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b9c1f3b Eclipse: Add a missing space in the documentation
| | * | | | | | | Eclipse: Add a missing space in the documentationJack O'Connor2013-05-011-1/+1
| | | | | | | | |
| * | | | | | | | Merge topic 'EclipseUseGmakeErrorParser_13699'Brad King2013-05-162-1/+16
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c46b46b Use GmakeErrorParser instead of deprecated MakeErrorParser (fixes bug 0013699)
| | * | | | | | | | Use GmakeErrorParser instead of deprecated MakeErrorParser (fixes bug 0013699)Victor Zverovich2013-04-282-1/+16
| | | | | | | | | |
| * | | | | | | | | 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
generated by cgit v0.12 at 2025-02-16 03:34:06 (GMT)