summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'usr-move-relocatable'Brad King2013-04-041-21/+19
|\ | | | | | | | | 6c613b4 Handle usr-move without forcing absolute paths (#14041)
| * Handle usr-move without forcing absolute paths (#14041)Brad King2013-04-031-21/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 0c727b90 (install(EXPORT): Force absolute paths for usr-move, 2013-03-08) and commit d4774140 (configure_package_config_file: force absolute paths for usr-move, 2013-01-24) we supported Linux distributions implementing the "/usr move" by assuming that installation to (/usr)?/lib(64)? represents a non-relocatable system package. When cross-compiling one may prepare a package for installation into a system location on a target machine but install the package files on the *host* machine inside another path for use with CMAKE_FIND_ROOT_PATH. In this case the package development files must still be relocatable. Handle "/usr move" with a new approach that works with relocatable files. Teach configure_package_config_file and install(EXPORT) to generate special logic in a package configuration file or targets file for installation under (/usr)?/lib(64)?. Teach the file to recognize when it is loaded through a symlink that refers to the same realpath as its original install destination. In such a case, use the original install prefix. Otherwise, compute the prefix relative to the current file location to make it relocatable.
* | Qt4: Fix typo setting a variable for FindThreads.Clinton Stimpson2013-04-021-1/+1
|/ | | | Fixes bug 14055.
* Merge topic 'ExactCaseReadmeTxt'Brad King2013-03-281-50/+65
|\ | | | | | | | | | | 5479251 Modules/readme.txt: make lines a bit shorter for easier readability 140692d Modules/readme.txt: switch from "XXX" to "Xxx"
| * Modules/readme.txt: make lines a bit shorter for easier readabilityAlex Neundorf2013-03-281-13/+28
| | | | | | | | | | | | | | This patch doesn't make them 79 characters long, but at least gets rid of really long lines. While at it, fix spelling of "relevant". Alex
| * Modules/readme.txt: switch from "XXX" to "Xxx"Alex Neundorf2013-03-281-47/+47
| | | | | | | | | | | | | | | | | | | | Using XXX as name of the package is ambiguous, since it can be interpreted as "ALLUPPERCASE" and also as "ExactCase (if the name is already ALLUPPERCASE)". After extensive discussion there is the conclusion that ExactCase is intended, so using a CamelCased name makes that more obvious. Alex
* | Merge topic 'use-java-INCLUDE_JARS'Brad King2013-03-281-18/+40
|\ \ | | | | | | | | | | | | 8a2fca8 UseJava.cmake: require explicit request to include jars
| * | UseJava.cmake: require explicit request to include jarsMatthew Woehlke2013-03-281-18/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify add_jar to (partly) use cmake_parse_arguments, and to require using the named argument list INCLUDE_JARS to specify jar files (or jar targets) to use as dependencies when creating a jar. This preserves the ability to have such, while restoring the historic behavior that jar files listed as sources are ignored. (The code now explicitly ignores them, however, rather than adding them to an unused local variable, so that it is more clear that nothing is being done with them.)
* | | Merge topic 'dev/add-isystem-for-clang'Brad King2013-03-281-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 4d668f3 Clang: Add -isystem flag support everywhere
| * | | Clang: Add -isystem flag support everywhereBen Boeckel2013-03-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In GNU.cmake, -isystem is not used if APPLE is set. However, Clang has pretty much always supported -isystem, so we should always use it. In the future, GNU.cmake should do a version check to see if -isystem is supported.
* | | | ExternalProject: Retry on a failed git cloneBill Hoffman2013-03-261-5/+15
| |_|/ |/| | | | | | | | | | | Git sometimes fails to clone repositories due to network outage or server load. Try 3 times before giving up.
* | | Merge topic 'FindImageMagick-v6.8.0-8'Brad King2013-03-191-3/+3
|\ \ \ | | | | | | | | | | | | | | | | dbd895b FindImageMagick: Search versioned suffixes (#14012)
| * | | FindImageMagick: Search versioned suffixes (#14012)Rex Dieter2013-03-181-3/+3
| | | | | | | | | | | | | | | | | | | | The parent commit added suffixes for -Q8 and -Q16 but there may also be versioned suffixes -6.Q8 and -6.Q16.
* | | | Merge topic 'Ruby-version-selection'Brad King2013-03-191-4/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d7e05e4 FindRuby: improve version selection
| * | | | FindRuby: improve version selectionRolf Eike Beer2013-03-181-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | This will stop e.g. looking for a ruby1.9 executable first if "1.8 EXACT" was given.
* | | | | Merge topic 'fix-java-jar-depends'Brad King2013-03-191-12/+23
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | adeafad UseJava.cmake: accept jar targets in add_jar 53a05b8 UseJava.cmake: fix passing jars to add_jar 45c8e4b UseJava.cmake: simplify path logic
| * | | UseJava.cmake: accept jar targets in add_jarMatthew Woehlke2013-03-131-1/+8
| | | | | | | | | | | | | | | | Modify add_jar to also accepts jars by target name.
| * | | UseJava.cmake: fix passing jars to add_jarMatthew Woehlke2013-03-131-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix setting classpath when encountering a jar argument to add_jar to actually set the variable that is used to specify the classpath to javac, instead of just uselessly appending the jar to CMAKE_JAVA_INCLUDE_PATH (which is never used again at the point where it is modified). Also, list jars so specified as dependencies of compiling the java sources for the jar target.
| * | | UseJava.cmake: simplify path logicMatthew Woehlke2013-03-131-11/+11
| | | | | | | | | | | | | | | | | | | | Move logic to determine relative path to .java file to after the file extension check, so that it only executes when it is actually used.
* | | | Merge topic 'findqt4-withqt5'Brad King2013-03-181-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 252bfd3 FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.
| * | | | FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.Clinton Stimpson2013-03-181-0/+7
| | | | |
* | | | | Merge topic 'fix-FPHSA-match'Brad King2013-03-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 78e6217 FPHSA: Fix FOUND_VAR check to work with if() auto-dereference
| * | | | | FPHSA: Fix FOUND_VAR check to work with if() auto-dereferenceStephen Kelly2013-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise, it seems to match on the content of the variable.
* | | | | | Merge topic 'set-QT_MAJOR_VERSION'Brad King2013-03-181-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4aa10cd FindQt4: Set the INTERFACE_QT_MAJOR_VERSION for Qt4::QtCore
| * | | | | | FindQt4: Set the INTERFACE_QT_MAJOR_VERSION for Qt4::QtCoreStephen Kelly2013-03-181-0/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a similar commit in Qt 5, this will error at CMake time if an attempt is made to use target_link_libraries(foo Qt4::QtCore Qt5::Core)
* | | | | | Merge topic 'set-Qt4_FOUND'Brad King2013-03-181-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28d14f9 FindQt4: Set the Qt4_FOUND variable if Qt4 is found
| * | | | | | FindQt4: Set the Qt4_FOUND variable if Qt4 is foundStephen Kelly2013-03-181-3/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | Provide the old QT4_FOUND for compatibility.
* | | | | | Merge topic 'TI_DSP_to_TI'Brad King2013-03-1810-46/+67
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 27e6f6e TI compiler: add automatic detection of prefix and suffixes b301586 rename TI_DSP toolchain to TI, since it works also for the ARM compiler 12b25df Determine C/CXX/Fortran compiler: fix indentation 7baa55a Determine C/CXX/Fortran compiler: minor restructuring
| * | | | | | TI compiler: add automatic detection of prefix and suffixesAlex Neundorf2013-03-143-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TI cross compilers are named e.g. cl6x or armcl, the accompanying strip and ar have the same prefixes/suffixes. Alex
| * | | | | | rename TI_DSP toolchain to TI, since it works also for the ARM compilerAlex Neundorf2013-03-147-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additionally, look for a special ar and strip Alex
| * | | | | | Determine C/CXX/Fortran compiler: fix indentationAlex Neundorf2013-03-143-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | | Determine C/CXX/Fortran compiler: minor restructuringAlex Neundorf2013-03-143-9/+15
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional changes, only change the way the if()-condition works, to make it easier to add more cases. Alex
* | | | | | Merge topic 'FindCUDA.cmake/SeparableCompilation'Brad King2013-03-181-13/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | b6e9b8f FindCUDA: Use the PRE_LINK mode only for MSVC >= 10
| * | | | | FindCUDA: Use the PRE_LINK mode only for MSVC >= 10James Bigler2013-03-141-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use normal custom command dependencies by default. Use the PRE_LINK approach only to work around what seems to be a bug in msbuild handling of custom build rules that chain together.
* | | | | | Merge topic 'aix-pic'Brad King2013-03-141-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | 5c8c1d6 XL: Use -qpic for position independent code (#14010)
| * | | | | XL: Use -qpic for position independent code (#14010)Brad King2013-03-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to XL C/C++ V9.0 documentation the default for -qpic/-qnopic is platform-dependent. It won't hurt to add the option on platforms where it is the default, so always add it when we want position independent code.
* | | | | | 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.
generated by cgit v0.12 at 2024-11-11 16:09:57 (GMT)