| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge topic 'fix-Qt-autogen' | Brad King | 2014-02-04 | 1 | -0/+8 |
|\ |
|
| * | FindQt4: Make AUTOMOC work regardless which order Qt 4/5 is found. | Stephen Kelly | 2014-01-29 | 1 | -0/+8 |
|
|
* | | Merge topic 'cmake-qt-manual' | Brad King | 2014-02-03 | 1 | -72/+1 |
|\ \ |
|
| * | | Help: Move Qt tool invocation information to a generic cmake-qt manual. | Stephen Kelly | 2014-02-02 | 1 | -72/+1 |
|
|
* | | | Merge topic 'FindCUDA-doc-format' | Brad King | 2014-02-03 | 1 | -161/+4 |
|\ \ \ |
|
| * | | | FindCUDA: Fix literal block formatting | Brad King | 2014-01-29 | 1 | -161/+4 |
| |/ / |
|
* | | | Merge topic 'find-java-os-x-fixes' | Brad King | 2014-02-03 | 3 | -56/+132 |
|\ \ \ |
|
| * | | | Find{Java,JNI}: Use /usr/libexec/java_home on OS X | Brad King | 2014-01-29 | 1 | -0/+11 |
|
|
| * | | | FindJNI: Overhaul finding JDK libraries and headers on OS X | Brad King | 2014-01-29 | 1 | -36/+56 |
|
|
| * | | | Find{Java,JNI}: Consider JAVA_HOME before ENV{JAVA_HOME} | Brad King | 2014-01-29 | 3 | -5/+40 |
|
|
| * | | | Find{Java,JNI}: Use ENV{JAVA_HOME} first when set | Brad King | 2014-01-29 | 2 | -17/+27 |
| |/ / |
|
* | | | Merge topic 'project-version-variables' | Brad King | 2014-02-03 | 2 | -3/+10 |
|\ \ \
| |/ /
|/| | |
|
| * | | write_basic_package_version_file: use PROJECT_VERSION | Alex Neundorf | 2014-01-29 | 2 | -3/+10 |
|
|
* | | | Merge topic 'fix-Qt-autogen' | Brad King | 2014-01-29 | 3 | -74/+32 |
|\ \ \
| | |/
| |/| |
|
| * | | QtAutogen: Separate source file processing from AUTOMOC. | Stephen Kelly | 2014-01-28 | 1 | -1/+1 |
|
|
| * | | Qt4: Use IMPORTED executable names with custom commands. | Stephen Kelly | 2014-01-28 | 1 | -9/+9 |
|
|
| * | | Qt4: Create IMPORTED executable targets for all Qt executables. | Stephen Kelly | 2014-01-28 | 1 | -64/+22 |
|
|
* | | | ExternalProject: Add option GIT_SUBMODULES | Gereon Kremer | 2014-01-28 | 1 | -6/+9 |
| |/
|/| |
|
* | | Merge topic 'robust-ep-download-verify' | Brad King | 2014-01-27 | 1 | -7/+27 |
|\ \
| |/
|/| |
|
| * | ExternalProject: Reattempt download when verification fails. | Matt McCormick | 2014-01-15 | 1 | -7/+27 |
|
|
* | | Merge topic 'qcc-id' | Brad King | 2014-01-22 | 10 | -26/+57 |
|\ \ |
|
| * | | QNX: Introduce QCC compiler id for that QNX platform compiler. | Stephen Kelly | 2014-01-22 | 6 | -22/+53 |
|
|
| * | | CMakeDetermine*Compiler: Fix typo 'lile' => 'like' | Stephen Kelly | 2014-01-22 | 4 | -4/+4 |
|
|
* | | | Merge topic 'osx-host-arch' | Brad King | 2014-01-21 | 1 | -1/+6 |
|\ \ \
| |/ /
|/| | |
|
| * | | OS X: Use 'uname -m' for processor (#14712) | Brad King | 2014-01-20 | 1 | -1/+6 |
|
|
* | | | Merge topic 'update-qt4-docs' | Brad King | 2014-01-20 | 1 | -367/+212 |
|\ \ \
| |/ /
|/| | |
|
| * | | Help: Update Qt4 documentation. | Stephen Kelly | 2014-01-15 | 1 | -367/+212 |
| |/ |
|
* | | GNUInstallDirs: Fix CMAKE_INSTALL_LIBDIR on Debian | Daniele E. Domenichelli | 2014-01-15 | 1 | -5/+59 |
|/ |
|
* | Merge topic 'doc-Qt-macro-TARGET-arg' | Brad King | 2014-01-15 | 1 | -7/+13 |
|\ |
|
| * | Document the TARGET options in Qt4 macros. | Stephen Kelly | 2014-01-14 | 1 | -7/+13 |
|
|
* | | Qt4: Use generator expression in COMPILE_DEFINITIONS (#14692) | Stephen Kelly | 2014-01-13 | 1 | -7/+1 |
|/ |
|
* | Merge topic 'find-java-os-x-fixes' | Brad King | 2014-01-10 | 1 | -0/+1 |
|\ |
|
| * | FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508) | Joe Abbey | 2014-01-09 | 1 | -0/+1 |
|
|
* | | Merge topic 'CheckTypeSize_fix_multiple_invocation' | Brad King | 2014-01-10 | 1 | -0/+2 |
|\ \ |
|
| * | | CheckTypeSize: Unset temporary variables when done (#14690) | Daniele E. Domenichelli | 2014-01-10 | 1 | -0/+2 |
|
|
* | | | Merge topic 'FindBoost-ms-debug-runtime' | Brad King | 2014-01-09 | 1 | -1/+7 |
|\ \ \
| |/ /
|/| | |
|
| * | | FindBoost: Add Boost_USE_DEBUG_RUNTIME option (#14686) | Brad King | 2014-01-08 | 1 | -1/+7 |
| |/ |
|
* | | Merge topic 'policies' | Brad King | 2014-01-09 | 1 | -11/+15 |
|\ \ |
|
| * | | FindQt4: Ensure target exists before calling get_target_property. | Stephen Kelly | 2014-01-08 | 1 | -11/+15 |
|
|
| * | | FindQt4: Fix use of get_target_property to use actual target name. | Stephen Kelly | 2014-01-08 | 1 | -1/+1 |
|
|
* | | | Merge topic 'qt4-find-root' | Brad King | 2014-01-09 | 1 | -2/+5 |
|\ \ \ |
|
| * | | | FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted. | Clinton Stimpson | 2014-01-08 | 1 | -2/+5 |
|
|
* | | | | Merge topic 'multiarch-multios' | Brad King | 2014-01-09 | 1 | -1/+1 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernels | Dimitri John Ledkov | 2013-12-19 | 1 | -1/+1 |
|
|
* | | | | Merge topic 'wix-cmake-package-registry' | Brad King | 2014-01-08 | 1 | -0/+11 |
|\ \ \ \ |
|
| * | | | | CPackWiX: added new CPACK_WIX_CMAKE_PACKAGE_REGISTRY variable | Nils Gladitz | 2014-01-08 | 1 | -0/+11 |
| | |_|/
| |/| | |
|
* | | | | Help: Fix some erroneous code block markers in Module docs. | Stephen Kelly | 2014-01-07 | 5 | -43/+19 |
|/ / / |
|
* | | | Merge topic 'minor-cleanups' | Brad King | 2014-01-06 | 1 | -64/+51 |
|\ \ \ |
|
| * | | | GenerateExportHeader: Reformat docs. | Stephen Kelly | 2014-01-04 | 1 | -64/+51 |
| | |/
| |/| |
|
* | | | Merge topic 'fix-text-typos' | Brad King | 2014-01-06 | 2 | -3/+3 |
|\ \ \
| |/ /
|/| | |
|