summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'findqt4-withqt5'Brad King2013-03-131-1/+1
|\ | | | | | | | | 161a793 FindQt4: Fix QT_QMAKE{_QMAKE => }_EXECUTABLE typo
| * FindQt4: Fix QT_QMAKE{_QMAKE => }_EXECUTABLE typoBrad King2013-03-131-1/+1
| | | | | | | | | | | | | | The parent commit accidentally referenced QT_QMAKE_QMAKE_EXECUTABLE which does not exist. Use QT_QMAKE_EXECUTABLE instead. Reported-by: m.hergarden@euphoria-it.nl
* | Merge topic 'cleanup-early-include-CTest-failure'Brad King2013-03-131-0/+4
|\ \ | | | | | | | | | | | | | | | | | | d90f49b CTest: Fail early without PROJECT_BINARY_DIR (#14005) 2e1c2bd build_command: Fail early without CMAKE_MAKE_PROGRAM (#14005) 4e5cb37 Refactor RunCMake.build_command test to allow more cases
| * | CTest: Fail early without PROJECT_BINARY_DIR (#14005)Brad King2013-03-121-0/+4
| | | | | | | | | | | | | | | | | | Do not use PROJECT_BINARY_DIR before it is defined. If it is not defined when needed, fail with an error message suggesting that the project() command be invoked first.
* | | Merge topic 'ExternalData-escape-semicolons'Brad King2013-03-131-5/+12
|\ \ \ | |/ / |/| | | | | | | | 1823ab4 ExternalData: Preserve escaped semicolons during argument expansion
| * | ExternalData: Preserve escaped semicolons during argument expansionBrad King2013-03-121-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMake language implicitly flattens lists so a ";" in a list element must be escaped with a backslash. List expansion removes backslashes escaping semicolons to leave raw semicolons in the values. Teach ExternalData_Add_Test and ExternalData_Expand_Arguments to re-escape semicolons found in list elements so the resulting argument lists work as if constructed directly by the set() command. For example: ExternalData_Add_Test(Data NAME test1 COMMAND ... "a\\;b") ExternalData_Expand_Arguments(Data args2 "c\\;d") add_test(NAME test2 COMMAND ... ${args2}) should be equivalent to set(args1 "a\\;b") add_test(NAME test1 COMMAND ... ${args1}) set(args2 "c\\;d") add_test(NAME test2 COMMAND ... ${args2}) which is equivalent to add_test(NAME test1 COMMAND ... "a;b") add_test(NAME test2 COMMAND ... "c;d") Note that it is not possible to make ExternalData_Add_Test act exactly like add_test when quoted arguments contain semicolons because the CMake language flattens lists when constructing function ARGN values. This re-escape approach at least allows test arguments to have semicolons. While at it, teach ExternalData APIs to not transform "DATA{...;...}" arguments because the contained semicolons are non-sensical. Suggested-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
* | | Merge topic 'findqt4-withqt5'Brad King2013-03-121-36/+53
|\ \ \ | | |/ | |/| | | | | | | 2112341 FindQt4: Do not use qmake from Qt5
| * | FindQt4: Do not use qmake from Qt5Janne Rönkkö2013-03-121-36/+53
| |/ | | | | | | | | | | | | | | | | Wihtout this, if qmake binary is from Qt5 the FindQt4 fails even though the Qt4 version of qmake would be installed as qmake-qt4. On Archlinux this is the case. Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
* | Merge topic 'aix-shared-flags'Brad King2013-03-122-2/+2
|\ \ | | | | | | | | | | | | bce7a2a AIX: Do not use -brtl to create shared libraries (#13997)
| * | AIX: Do not use -brtl to create shared libraries (#13997)Brad King2013-03-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag was added incorrectly by commit 9c3a6eb4 (Need -brtl when creating shared libraries, 2003-05-16). According to "man ld" the -G option implies "-brtl -bnortllib ...", -brtl implies "-brtllib", and -brtllib should only be used for executables, not shared libraries. Therefore it is incorrect and unnecessary to specify -brtl explicitly after -G. Reported-by: Kevin Burge <kcburge@gmail.com>
* | | Merge topic 'Win-HOST_SYSTEM_PROCESSOR'Brad King2013-03-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 20681c9 fix Windows processor detection
| * | | fix Windows processor detectionRolf Eike Beer2013-03-061-1/+1
| | | | | | | | | | | | | | | | Thanks to Martin Koller for this.
* | | | Merge topic 'FindCUDA.cmake/AddCUDA_cupti_LIBRARY'Brad King2013-03-121-7/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c939b49 FindCUDA: Added cupti library.
| * | | | FindCUDA: Added cupti library.James Bigler2013-03-121-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to adding the cupti library, find_local_library_first has been renamed to cuda_find_local_library_first with a backward compatibility macro to find_local_library_first. Also added cuda_find_local_library_first_with_path_ext to handle different paths.
* | | | | Merge topic 'FindCUDA.cmake/SeparableCompilation'Brad King2013-03-121-1/+150
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6a19150 FindCUDA: Add support for separable compilation
| * | | | | FindCUDA: Add support for separable compilationJames Bigler2013-03-121-1/+150
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new variable, CUDA_SEPARABLE_COMPILATION, and two new functions, CUDA_COMPUTE_SEPARABLE_COMPILATION_OBJECT_FILE_NAME and CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS. When CUDA_SEPARABLE_COMPILATION is specified then CUDA runtime objects will be compiled with the separable compilation flag. These object files are collected in a target named variable that can be used in CUDA_COMPUTE_SEPARABLE_COMPILATION_OBJECT_FILE_NAME and CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS.
* | | | | Merge topic 'FindCUDA.cmake/DontLinkAgainstCUDADriver'Brad King2013-03-121-5/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3497bc2 FindCUDA: Remove linkage against CUDA driver library (#13084)
| * | | | | FindCUDA: Remove linkage against CUDA driver library (#13084)James Bigler2013-03-121-5/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | The CUDA runtime library (libcudart) doesn't depend on the driver API library (libcuda) and shouldn't be used to link CUDA run time codes.
* | | | | Merge topic 'FindImageMagick-v6.8.0-8'Brad King2013-03-121-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | 5fe9855 FindImageMagick: Search quantum depth suffixes (#13859)
| * | | | FindImageMagick: Search quantum depth suffixes (#13859)Slava Sysoltsev2013-03-011-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From ImageMagick's 6.8.0-8 changelog: http://www.imagemagick.org/script/changelog.php ABI is incompatible if quantum depth change. Add abi indication to library name. Search for library names with -Q16 and -Q8 suffixes. Reported-by: Evangelos Foutras <evangelos@foutrelis.com>
* | | | Merge topic 'GetPrerequisites-objdump'Brad King2013-03-041-19/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12fb50d GetPrerequisites: Add documentation for objdump 8eb2fe9 GetPrerequisites: Enable test for BundleUtilities on MinGW 33c94c8 GetPrerequisites: Add support for objdump 5260a86 GetPrerequisites: Move tool search paths up
| * | | | GetPrerequisites: Add documentation for objdumpMichael Tänzer2013-03-011-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Tänzer <neo@nhng.de>
| * | | | GetPrerequisites: Add support for objdumpMichael Tänzer2013-02-281-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it usable on MinGW without Visual Studio installed. Signed-off-by: Michael Tänzer <neo@nhng.de>
| * | | | GetPrerequisites: Move tool search paths upMichael Tänzer2013-02-281-17/+18
| |/ / / | | | | | | | | | | | | | | | | | | | | Make them usable in the gp_tool selection heuristic. Signed-off-by: Michael Tänzer <neo@nhng.de>
* | | | Merge topic 'non-fatal-Qt4-missing-targets'Brad King2013-03-041-6/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4d5230d Only add existing targets to the Qt4 target depends properties.
| * | | | Only add existing targets to the Qt4 target depends properties.Stephen Kelly2013-02-261-6/+10
| |/ / / | | | | | | | | | | | | | | | | Qt can be configured in ways which disable certain modules. Make sure we don't fail on that.
* | | | Merge topic 'Win-HOST_SYSTEM_PROCESSOR'Brad King2013-03-041-1/+5
|\ \ \ \ | |/ / / |/| / / | |/ / | | | add8d22 properly detect processor architecture on Windows
| * | properly detect processor architecture on WindowsRolf Eike Beer2013-02-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | CMake is usually run as a 32 bit process even on 64 bit Windows, so the PROCESSOR_ARCHITECTURE environment variable would always return x86. This post gives a description on how to do it properly: http://blogs.msdn.com/b/david.wang/archive/2006/03/26/howto-detect-process-bitness.aspx
* | | Merge topic 'FPHSA_FOUND_VAR_OPTION'Brad King2013-02-251-23/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f17711c FPHSA: Convert FOUND_VAR failure test to RunCMake c1f5780 FPHSA: improve documentation 7bb1abe FPHSA: Add FOUND_VAR option to specify _FOUND variable name
| * | | FPHSA: improve documentationAlex Neundorf2013-02-221-8/+12
| | | | | | | | | | | | | | | | Alex
| * | | FPHSA: Add FOUND_VAR option to specify _FOUND variable nameAlex Neundorf2013-02-221-15/+32
| |/ / | | | | | | | | | | | | | | | | | | | | | In the new mode FPHSA now accepts a FOUND_VAR option, which can be set either to ExactCase_FOUND or UPPERCASE_FOUND, no other values are accepted. Also add tests for that, including failure. Alex
* | | Merge topic 'try_compile-targets'Brad King2013-02-2511-54/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 236133e Handle targets in the LINK_LIBRARIES of try_compile. 1c0597c Add a new Export generator for IMPORTED targets. f2ab17d Keep track of all targets seen while evaluating a genex.
| * | | Handle targets in the LINK_LIBRARIES of try_compile.Stephen Kelly2013-02-2211-54/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Imported targets are re-exported so that they can be used by the try_compile generated code with target_link_libraries. This makes the use of the cmake_expand_imported_targets macro obsolete. The macro is not able to expand the generator expressions which may appear in the IMPORTED_LINK_INTERFACE_LIBRARIES content. Instead it just sees them as 'not a target'.
* | | | Merge topic 'generate-export-header-warnings'Brad King2013-02-251-4/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 1e0891e Removed GenerateExportHeader warnings about old compilers
| * | | | Removed GenerateExportHeader warnings about old compilersMarcus D. Hanwell2013-02-201-4/+0
| | |/ / | |/| | | | | | | | | | | | | | These warnings tend to flood the dashboard submissions, and it is doing what it should (degrade gracefully with older compilers).
* | | | Merge topic 'fix-GEH-docs'Brad King2013-02-251-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | 0ebf332 Fix GenerateExportHeader documentation #13936
| * | | Fix GenerateExportHeader documentation #13936Stephen Kelly2013-02-201-1/+1
| |/ / | | | | | | | | | | | | There is no CMAKE_CURRENT_BUILD_DIR. CMAKE_CURRENT_BINARY_DIR is the correct variable here.
* | | NAG: Use -PIC for Fortran position-independent code (#13932)Neil Carlson2013-02-181-0/+1
|/ / | | | | | | | | The Numerical Algorithms Group (NAG) Fortran compiler documents -PIC for position-independent code.
* | Merge topic 'rpath-use-implicit-link-dirs'Brad King2013-02-151-0/+1
|\ \ | | | | | | | | | | | | | | | | | | 95a9c80 Merge topic 'LINK_LIBRARIES-property' into rpath-use-implicit-link-dirs baa33ac AIX-GNU: Put implicit link directories in runtime libpath (#13909) 171b099 Avoid duplicate RPATH entries
| * \ Merge topic 'LINK_LIBRARIES-property' into rpath-use-implicit-link-dirsBrad King2013-02-1499-994/+1576
| |\ \ | | | | | | | | | | | | Resolve a logical conflict in the signature of cmTarget::GetLinkClosure.
| * | | AIX-GNU: Put implicit link directories in runtime libpath (#13909)Brad King2013-02-141-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GNU compiler front-ends on AIX invoke the linker with flags of the form "-L/path/to/gnu/runtime/lib" to tell ld where to find the language runtime libraries. They depend on the default libpath behavior documented in "man ld" to add the -L paths also to the runtime libpath so the dynamic loader can find the language runtime libraries. This differs from platforms whose linkers have distinct -rpath flags that non-system compilers can use to tell the dynamic loader where to find their language runtime libraries. Since commit 96fd5909 (Implement linking with paths to library files, 2008-01-22) CMake always passes "-Wl,-blibpath:" followed by any project-defined RPATH plus "/usr/lib:/lib" in order to explicitly set the runtime libpath and avoid getting all the project -L paths in the runtime libpath. The explicit libpath prevents the GNU compiler runtime library -L paths from being placed in the libpath and then the dynamic loader fails to find the language runtime libraries. CMake already detects the implicit link directories for each language since commit 07ea19ad (Implicit link info for C, CXX, and Fortran, 2009-07-23). Add the implicit link directories to the explicit runtime libpath for GNU compilers on AIX to fix this use case.
* | | Merge topic 'OpenMP-doc'Brad King2013-02-151-1/+3
|\ \ \ | | | | | | | | | | | | | | | | 77fd5e5 FindOpenMP: improve documentation (#13895)
| * | | FindOpenMP: improve documentation (#13895)Rolf Eike Beer2013-02-131-1/+3
| | | |
* | | | Merge topic 'Embarcadero-linker-flags'Brad King2013-02-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 188b0e9 Embarcadero: Fix default link stack/heap flags (#13912)
| * | | | Embarcadero: Fix default link stack/heap flags (#13912)Brad King2013-02-131-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit c70beb4b (change the default borland stack size, 2003-05-05), commit 1b572eb9 (remove -H flags, 2003-05-08), and commit 2d411398 (Stack size in generated programs should be 10 meg, 2003-06-12) CMake adds link flags to select a 10MB stack. At the time this was for consistency with our behavior on MS, but that was recently removed by commit 51af1da3 (Remove "/STACK:10000000" from default linker flags, 2012-11-23). Change our Embarcadero link flags to select the default stack and heap settings according to the compiler documentation. This is more reliable than leaving the flags out completely as it has been reported that the linker does not always use its documented defaults. Suggested-by: Mathäus Mendel <contato@mathausmendel.com>
* | | | Merge topic 'linked-usage-cleanup'Brad King2013-02-151-8/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fde949d Don't add target-specific interface includes and defines to Qt 4 targets. 79ae968 Revert "Add a way to exclude INTERFACE properties from exported targets." 71bf96e Revert "find_package: Reword <package>_NO_INTERFACES documentation" 3df36b5 Revert "Add the $<LINKED:...> generator expression." e1f9080 Don't populate INTERFACE includes and defines properties in tll. 567c8d1 Revert "Don't allow utility or global targets in the LINKED expression." a1c4905 Use the link information as a source of compile definitions and includes. 5c9f5e3 Don't use LINKED where not needed. 5b88504 Rename the IncludeDirectoriesEntry to be more generic. b030323 Fix determination of when we're evaluating compile definitions.
| * | | Don't add target-specific interface includes and defines to Qt 4 targets.Stephen Kelly2013-02-131-8/+0
| | | | | | | | | | | | | | | | | | | | This is a partial revert of commit c8ee07d0 (FindQt4: Add INTERFACE includes and defines to Qt4 targets, 2012-12-31).
* | | | Merge topic 'EclipseDetectClangIncludeDirs'Brad King2013-02-121-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a396b6e Eclipse: also detect include dirs and macro for clang (#13823)
| * | | | Eclipse: also detect include dirs and macro for clang (#13823)Alex Neundorf2013-02-101-2/+2
| | | | | | | | | | | | | | | | | | | | Alex
* | | | | Merge topic 'CPackRPM-fixSomeRPMSpecificVarHandling'Brad King2013-02-121-9/+19
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | 9be3da1 CPackRPM fix #13898 uses IF(DEFINED var) to avoid wrong var value logic
generated by cgit v0.12 at 2025-01-04 01:38:00 (GMT)