summaryrefslogtreecommitdiff
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Qt4: Use correct qdbus executable in macro.Stephen Kelly2014-03-101-1/+1
| | | | | | Commit v3.0.0-rc1~71^2~9 (Qt4: Use IMPORTED executable names with custom commands., 2014-01-24) erroneusly changed this command to use the wrong target.
* find_dependency: unset cmake_fd_version variable at end of macroAlex Merry2014-02-261-0/+1
| | | | This matches the other macro variables.
* find_dependency: use correct version variable nameAlex Merry2014-02-261-1/+1
| | | | The code set cmake_fd_version, but used ${version}.
* find_dependency: Ensure that ARGV1 has valid local contentStephen Kelly2014-02-241-1/+4
| | | | | The ARGV1 value could come from a wrapping context if find_dependency is called from a function.
* find_dependency: Add namespacing for variables in the macro.Stephen Kelly2014-02-241-13/+17
| | | | Avoid setting a variable called 'version' etc.
* Always set version variable of find_dependency macroAlex Merry2014-02-231-3/+1
| | | | | | | | | | | If there is no ARGV1, that is fine; version will be made empty, and no version will be passed to find_package(). This is relevant when find_dependency is invoked multiple times, sometimes with a version specified and sometimes without. find_dependency(dep1 3.4) find_dependency(dep2) # version still set to 3.4.
* CMake 3.0.0-rc1 version updateBrad King2014-02-191-1/+1
|
* Merge topic 'FindOpenSSL-prefer-root'Brad King2014-02-191-5/+5
|\ | | | | | | | | e346c47a FindOpenSSL: Prefer OPENSSL_ROOT_DIR first (#14764)
| * FindOpenSSL: Prefer OPENSSL_ROOT_DIR first (#14764)Ho Cheung2014-02-181-5/+5
| | | | | | | | | | Use hints computed from this explicit variable before those computed by PkgConfig. They are more specific.
* | Merge topic 'FindJNI-ppc64le'Brad King2014-02-191-0/+2
|\ \ | | | | | | | | | | | | ac2527e1 FindJNI: Add ppc64le architecture
| * | FindJNI: Add ppc64le architectureDinar Valeev2014-02-181-0/+2
| |/ | | | | | | Signed-off-by: Dinar Valeev <dvaleev@suse.com>
* | FindBoost: Add suport for custom namespacesChuck Atkins2014-02-171-25/+37
|/ | | | | | | | | | When building boost with an alternate namespace the libraries generated will have a different naming convention. This is often done to ensure no symbol conflicts with external libraries built against a different version of boost. If the namespace used is "myprivateboost::" instead of "boost::" then the libraries built will be named myprivateboost_foo instead of boost_foo. Add an option to specify a custom namespace used to alter the library names that get searched for.
* Merge topic 'isystemForIcpc'Brad King2014-02-172-0/+2
|\ | | | | | | | | cab5ebd4 Intel compiler: add -isystem flag under Linux
| * Intel compiler: add -isystem flag under LinuxAlex Neundorf2014-02-072-0/+2
| | | | | | | | | | | | | | This makes the SYSTEM keyword work with the Intel compiler under Linux. AFAIK this is supported neither under Windows nor OSX. Alex
* | Merge topic 'osx-intel-info-split'Brad King2014-02-126-134/+36
|\ \ | | | | | | | | | | | | 3693c63f OS X: Split Intel compiler information files
| * | OS X: Split Intel compiler information filesBrad King2014-02-116-134/+36
| | | | | | | | | | | | | | | | | | | | | | | | Create platform information modules Platform/Darwin-Intel-(C|CXX).cmake and helper module Platform/Darwin-Intel.cmake. Teach existing module Platform/Darwin-Intel-Fortran.cmake to use the helper too. Move information from Platform/Darwin-icc.cmake into these files and drop information already in Platform/Darwin.cmake to avoid duplication.
* | | Merge topic 'FindBoost-MPI-hints'Brad King2014-02-121-4/+31
|\ \ \ | |/ / |/| | | | | | | | a22eeca3 FindBoost: Search next to MPI libraries for boost_mpi (#14739)
| * | FindBoost: Search next to MPI libraries for boost_mpi (#14739)Brad King2014-02-101-4/+31
| |/ | | | | | | | | | | | | | | | | | | Some distributions place boost_mpi next to the MPI libraries against which it was built instead of next to the other Boost libraries. If find_package(MPI) has already been run prior to find_package(Boost) then MPI_CXX_LIBRARIES or MPI_C_LIBRARIES may be set to the location of the MPI libraries. Teach FindBoost.cmake to look there for boost_mpi and boost_mpi_python after looking next to the other Boost libraries but not consider the location to be Boost_LIBRARY_DIR.
* | Merge topic 'graphviz-one-file'Brad King2014-02-111-0/+14
|\ \ | | | | | | | | | | | | 18bef4cd graphviz: allow to disable per target graphs (#14746)
| * | graphviz: allow to disable per target graphs (#14746)Daniel Pfeifer2014-02-101-0/+14
| |/ | | | | | | | | | | | | In CMakeGraphVizOptions.cmake, allow the options GRAPHVIZ_GENERATE_PER_TARGET and GRAPHVIZ_GENERATE_DEPENDERS to enable the generation of per target graphs and subgraphs respectively. Both options are TRUE per default to maintain current behavior.
* | Merge topic 'Qt4-qmake-IMPORTED'Brad King2014-02-101-0/+5
|\ \ | | | | | | | | | | | | 7d90d6c5 Qt4: Add IMPORTED executable for qmake.
| * | Qt4: Add IMPORTED executable for qmake.Stephen Kelly2014-02-091-0/+5
| |/
* | Merge topic 'wix_desktop'Brad King2014-02-101-1/+3
|\ \ | | | | | | | | | | | | b78d74de CPackWiX: Add support for CPACK_CREATE_DESKTOP_LINKS
| * | CPackWiX: Add support for CPACK_CREATE_DESKTOP_LINKSTimo Rothenpieler2014-02-081-1/+3
| |/
* | Merge topic 'intel-visibility'Brad King2014-02-104-8/+10
|\ \ | |/ |/| | | | | b7f58511 Visibility: the Intel compiler does not support -fvisibility on windows
| * Visibility: the Intel compiler does not support -fvisibility on windowsNils Gladitz2014-02-074-8/+10
| |
* | Merge topic 'FindOpenSSL-root-dir'Brad King2014-02-061-4/+5
|\ \ | | | | | | | | | | | | 12d6eb63 FindOpenSSL: Honor OPENSSL_ROOT_DIR everywhere (#14735)
| * | FindOpenSSL: Honor OPENSSL_ROOT_DIR everywhere (#14735)Ho Cheung2014-02-051-4/+5
| |/ | | | | | | | | | | In commit v2.8.5~176^2~2 (FindOpenSSL: We should only use hints to find OpenSSL, 2011-03-28) values for HINTS and PATHS of find_* calls were computed everywhere but only used on Windows. Use them everywhere.
* | Help: Specify that qtmain.lib is only used for WIN32 executables.Stephen Kelly2014-02-051-1/+2
|/
* Merge topic 'FeatureSummary-no-transitive'Brad King2014-02-052-0/+15
|\ | | | | | | | | a6971f65 FeatureSummary: Don't list transitive package dependencies
| * FeatureSummary: Don't list transitive package dependenciesStephen Kelly2014-02-032-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set a global property in the find_package implementation. Track and reset that property in the find_dependency macro. Read the property in FeatureSummary when determining whether to print output. This means that packages which are found only as dependencies are not listed by FeatureSummary, but if a project uses find_package elsewhere directly, then it will be listed by FeatureSummary. Suggested-by: Alex Merry http://thread.gmane.org/gmane.comp.kde.devel.frameworks/10640
* | Merge topic 'fix-Qt-autogen'Brad King2014-02-041-0/+8
|\ \ | | | | | | | | | | | | | | | 6053ce22 QtAutogen: Make uic work even when the source is in a subdir. 1fc9ecfa FindQt4: Make AUTOMOC work regardless which order Qt 4/5 is found.
| * | FindQt4: Make AUTOMOC work regardless which order Qt 4/5 is found.Stephen Kelly2014-01-291-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 321e348e (QtAutogen: Use Qt 4 IMPORTED targets to find executable locations., 2014-01-24) attempted to fix this problem, but only solved it for a particular ordering of find_package for Qt 4 and Qt 5. Add a test to ensure that it works with both orderings.
* | | Merge topic 'cmake-qt-manual'Brad King2014-02-031-72/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4271a4ed Help: Add information about INTERFACE_AUTOUIC_OPTIONS. 7935f4de Help: Note that AUTOMOC consumes the defines and includes from targets. 2739a6f9 Help: Move Qt tool invocation information to a generic cmake-qt manual.
| * | | Help: Move Qt tool invocation information to a generic cmake-qt manual.Stephen Kelly2014-02-021-72/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | Add an introduction about the use of different package types, and the ability to use Qt 4 and 5 versions together in a single buildsystem. Add a section about automatic linking of the qtmain.lib library and how to disable it.
* | | Merge topic 'FindCUDA-doc-format'Brad King2014-02-031-161/+4
|\ \ \ | | | | | | | | | | | | | | | | 1f8eb5db FindCUDA: Fix literal block formatting
| * | | FindCUDA: Fix literal block formattingBrad King2014-01-291-161/+4
| |/ / | | | | | | | | | Fix locations of '::' manually to group literal blocks as desired.
* | | Merge topic 'find-java-os-x-fixes'Brad King2014-02-033-56/+132
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | dd72b19f Find{Java,JNI}: Use /usr/libexec/java_home on OS X 70560ee1 FindJNI: Overhaul finding JDK libraries and headers on OS X fcd66a7f Find{Java,JNI}: Consider JAVA_HOME before ENV{JAVA_HOME} 4b3614b2 Find{Java,JNI}: Use ENV{JAVA_HOME} first when set
| * | | Find{Java,JNI}: Use /usr/libexec/java_home on OS XBrad King2014-01-291-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If no JAVA_HOME or ENV{JAVA_HOME} is set then try running this tool to get the system default Java home. Suggested-by: Larry Shaffer <larrys@dakotacarto.com>
| * | | FindJNI: Overhaul finding JDK libraries and headers on OS XBrad King2014-01-291-36/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the hard-coded framework paths and "-framework JavaJM" on APPLE. Save and restore the value of CMAKE_FIND_FRAMEWORK. Use its value to choose and order between a normal search for jvm&jawt and a framework search for JavaVM. When JAVA_HOME is set explicitly by the user then force a normal search by setting CMAKE_FIND_FRAMEWORK to NEVER. Once the library is found, set CMAKE_FIND_FRAMEWORK to help find_path locate the matching headers (framework v. normal).
| * | | Find{Java,JNI}: Consider JAVA_HOME before ENV{JAVA_HOME}Brad King2014-01-293-5/+40
| | | | | | | | | | | | | | | | | | | | | | | | Add a helper module CMakeFindJavaCommon shared between FindJava and FindJNI to select a JAVA_HOME value. Prefer a CMake variable or cache entry first, then an environment variable.
| * | | Find{Java,JNI}: Use ENV{JAVA_HOME} first when setBrad King2014-01-292-17/+27
| |/ / | | | | | | | | | | | | | | | Use list(APPEND) instead of set() to append to lists. When ENV{JAVA_HOME} is set explicitly place values based on it at the front their lists.
* | | Merge topic 'project-version-variables'Brad King2014-02-032-3/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 41d2f2c4 write_basic_package_version_file: use PROJECT_VERSION 7e142c5a project: Manage VERSION variables 16d040c9 project: Add optional LANGUAGES keyword 00007dcc Help: Format project command and variable documentation
| * | write_basic_package_version_file: use PROJECT_VERSIONAlex Neundorf2014-01-292-3/+10
| | | | | | | | | | | | | | | | | | | | | In the write_basic_package_version_file(), the VERSION argument is now optional. If none is given, it falls back to ${PROJECT_VERSION}. Alex
* | | Merge topic 'fix-Qt-autogen'Brad King2014-01-293-74/+32
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7ae1d8a QtAutogen: Short-circut some logic when moc is not available. 4b989d5f QtAutogen: Separate source file processing from AUTOMOC. c48d877d QtAutogen: Make some methods appropriately file-static. 394e86df QtAutogen: Fix autouic target options in the presence of a config. 964d7f2a QtAutogen: Remove unused variables. 0d934efd QtAutogen: Remove read of SKIP_AUTOUIC target property. 321e348e QtAutogen: Use Qt 4 IMPORTED targets to find executable locations. e96683b0 Qt4: Use IMPORTED executable names with custom commands. e6182f5d Qt4: Create IMPORTED executable targets for all Qt executables.
| * | QtAutogen: Separate source file processing from AUTOMOC.Stephen Kelly2014-01-281-1/+1
| | | | | | | | | | | | This will allow using AUTOUIC without using AUTOMOC for example.
| * | Qt4: Use IMPORTED executable names with custom commands.Stephen Kelly2014-01-281-9/+9
| | | | | | | | | | | | | | | | | | Finding Qt 5 can overwrite the QT_MOC_EXECUTABLE variable with the moc from Qt 5. Use the IMPORTED target with the explicit version in the name to avoid that.
| * | Qt4: Create IMPORTED executable targets for all Qt executables.Stephen Kelly2014-01-281-64/+22
| | | | | | | | | | | | | | | Qt 5 already has similar IMPORTED targets. The versioned namespace will allow de-conflicting the variable names between Qt 4 and Qt 5.
* | | ExternalProject: Add option GIT_SUBMODULESGereon Kremer2014-01-281-6/+9
| |/ |/| | | | | | | This option allows to filter the submodules that are checked out. Add a simple testcase for GIT_SUBMODULES option passing an empty list.
* | Merge topic 'robust-ep-download-verify'Brad King2014-01-271-7/+27
|\ \ | |/ |/| | | | | | | | | | | a432b93b file DOWNLOAD: Display the curl result status when a hash mismatch occurs. 1cb9ef81 file DOWNLOAD: Test non-zero return status. f73f0fb3 file DOWNLOAD: Add test for bad hash. b5e2265f ExternalProject: Reattempt download when verification fails.
View Lorry Controller Status