summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'automoc-append-implicit-dirs'Brad King2013-03-191-13/+24
|\ | | | | | | | | 753b905 Automoc: append implicit includes after user-specified dirs
| * Automoc: append implicit includes after user-specified dirsStephen Kelly2013-03-191-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit d2536579 (Automoc: fix regression #13667, broken build in phonon, 2012-11-19) changed Automoc to try to re-add the Qt header dir if it was stripped out as an implicit include from the moc command line. When invoking a compiler, those directories are stripped out because they are built-in, but for moc, there are no built-in directories. The follow-up commit acc22400 (Automoc: get include dirs without stripping implicit include dirs off, 2012-12-07) went further by not removing the implicit include dirs, if they were specified specifically by the user. This had the remaining problem that the implicit include dirs appeared in a different order of precedence for moc compared to the compiler. Resolve that by stripping out the include dirs, where specified for the moc command line to, and then appending them at the end. Note that the order of the appended implicit include directories is the order they are specified in the CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES, not the order specified by the user.
* | Merge topic 'expand-version-of-Qt5-gui-fix'Brad King2013-03-191-1/+1
|\ \ | | | | | | | | | | | | 6387f6d cmake-gui: Use the QStandardItemModel workaround until 5.1.0.
| * | cmake-gui: Use the QStandardItemModel workaround until 5.1.0.Stephen Kelly2013-03-191-1/+1
| |/ | | | | | | | | | | | | | | | | | | If there is a Qt 5.0.3 release, it may or may not contain the patch that fixes this issue. http://thread.gmane.org/gmane.comp.lib.qt.releasing/882 Just use the workaround until 5.1.0 which certainly will contain the fix. Don't use the workaround before Qt 5.0.0.
* | 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-genex-preprocess'Brad King2013-03-192-2/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 7a619fa Fix cmGeneratorExpression::Preprocess for interleaved inputs.
| * | | | Fix cmGeneratorExpression::Preprocess for interleaved inputs.Stephen Kelly2013-03-182-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't find both preprocessing expressions at once, because then the BUILD_INTERFACE will always be favored if both are present, even if INSTALL_INTERFACE appears first. This was affecting the behavior of install(EXPORT) because the INTERFACE_INCLUDE_DIRECTORIES contained entries like /foo/include;$<INSTALL_INTERFACE:/bar/include> As the INSTALL_INTERFACE always evaluates to '0', it always needs to be preprocessed properly.
* | | | | 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.
* | | | | | CMake Nightly Date StampKitware Robot2013-03-191-1/+1
| |_|/ / / |/| | | |
* | | | | 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 'CMAKE_AUTOMOC-Qt5-docs'Brad King2013-03-181-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b386b3 Document that CMAKE_AUTOMOC works with Qt 5.
| * | | | | | | Document that CMAKE_AUTOMOC works with Qt 5.Stephen Kelly2013-03-161-1/+2
| |/ / / / / /
* | | | | | | Merge topic 'set-QT_MAJOR_VERSION'Brad King2013-03-188-0/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4aa10cd FindQt4: Set the INTERFACE_QT_MAJOR_VERSION for Qt4::QtCore
| * | | | | | | FindQt4: Set the INTERFACE_QT_MAJOR_VERSION for Qt4::QtCoreStephen Kelly2013-03-188-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1811-47/+68
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-148-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | CMake Nightly Date StampKitware Robot2013-03-181-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2013-03-171-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2013-03-161-1/+1
| |_|/ / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-03-151-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'configure-no-tests'Brad King2013-03-141-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dd8a06b Configure Tests/CMakeTests only with BUILD_TESTING ON
| * | | | | Configure Tests/CMakeTests only with BUILD_TESTING ONBrad King2013-03-131-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e03f83f3 (ProcessorCount test: fix path to cmsysTestsCxx executable, 2013-01-24) the directory references a target that is not built when BUILD_TESTING is OFF. It makes no sense to add tests without BUILD_TESTING anyway. While at it, use add_subdirectory instead of subdirs to add CMakeTests.
* | | | | 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.
* | | | | | CMake Nightly Date StampKitware Robot2013-03-141-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'ninja-escape-line-breaks'Brad King2013-03-131-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3b4436a Ninja: escape line breaks in literals
| * | | | | Ninja: escape line breaks in literalsPeter Kümmel2013-03-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | BUG: 13591
* | | | | | 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 'qt5-fixes'Brad King2013-03-132-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 404e1d6 cmake-gui: Workaround bug in Qt 5.0.0 to 5.0.3 QStandardItemModel 5144f6f cmake-gui: Use -fPIE if required by Qt.
| * | | | | | cmake-gui: Workaround bug in Qt 5.0.0 to 5.0.3 QStandardItemModelStephen Kelly2013-03-121-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit in qtbase 9dfba89c (Add implementations of QAIM::sibling in public APIs., 2012-09-26) added a buggy implementation of sibling(), and the commit f136701b (Use the base implementation of QAbstractItemModel::sibling in QSIM., 2013-02-21) resolves it. Workaround the bug for Qt releases that have it.
| * | | | | | cmake-gui: Use -fPIE if required by Qt.Stephen Kelly2013-03-121-0/+2
| | | | | | |
* | | | | | | Merge topic 'cleanup-early-include-CTest-failure'Brad King2013-03-1317-60/+116
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-127-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v0.12 at 2025-02-02 05:15:08 (GMT)