kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
20,821 Commits 1 Branch 14 Tags
Commit Graph

20821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
017478570e Merge topic 'expand-version-of-Qt5-gui-fix' 
6387f6d cmake-gui: Use the QStandardItemModel workaround until 5.1.0.
 2013-03-19 15:20:37 -04:00
Brad King
36f158159b Merge topic 'FindImageMagick-v6.8.0-8' 
dbd895b FindImageMagick: Search versioned suffixes (#14012)
 2013-03-19 15:20:34 -04:00
Brad King
b04b8ddfd8 Merge topic 'Ruby-version-selection' 
d7e05e4 FindRuby: improve version selection
 2013-03-19 15:20:30 -04:00
Brad King
16695a6d77 Merge topic 'fix-genex-preprocess' 
7a619fa Fix cmGeneratorExpression::Preprocess for interleaved inputs.
 2013-03-19 15:20:27 -04:00
Brad King
cc1c533163 Merge topic 'fix-java-jar-depends' 
adeafad UseJava.cmake: accept jar targets in add_jar
53a05b8 UseJava.cmake: fix passing jars to add_jar
45c8e4b UseJava.cmake: simplify path logic
 2013-03-19 15:20:22 -04:00
Stephen Kelly
6387f6d85c cmake-gui: Use the QStandardItemModel workaround until 5.1.0. 
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.
 2013-03-19 15:14:46 -04:00
Brad King
763a6dcd33 string: Fix regex documentation of '^' and '$' (#14028) 
They match at the beginning and end of the input, not by line.

Reported-by: Martin Perzl <martin.perzl@web.de>
 2013-03-19 13:14:22 -04:00
Kitware Robot
5dfa6240eb CMake Nightly Date Stamp 2013-03-19 00:01:07 -04:00
Rex Dieter
dbd895b897 FindImageMagick: Search versioned suffixes (#14012) 
The parent commit added suffixes for -Q8 and -Q16 but there may also be
versioned suffixes -6.Q8 and -6.Q16.
 2013-03-18 16:37:50 -04:00
Rolf Eike Beer
d7e05e4144 FindRuby: improve version selection 
This will stop e.g. looking for a ruby1.9 executable first if "1.8 EXACT" was
given.
 2013-03-18 20:17:08 +01:00
Stephen Kelly
7a619fa6fb Fix cmGeneratorExpression::Preprocess for interleaved inputs. 
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.
 2013-03-18 15:09:47 +01:00
Brad King
526cbafa4e Merge topic 'findqt4-withqt5' 
252bfd3 FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes.
 2013-03-18 09:42:06 -04:00
Brad King
68e86af6f7 Merge topic 'fix-FPHSA-match' 
78e6217 FPHSA: Fix FOUND_VAR check to work with if() auto-dereference
 2013-03-18 09:41:59 -04:00
Brad King
85f7caabbb Merge topic 'CMAKE_AUTOMOC-Qt5-docs' 
1b386b3 Document that CMAKE_AUTOMOC works with Qt 5.
 2013-03-18 09:41:55 -04:00
Brad King
758651f124 Merge topic 'set-QT_MAJOR_VERSION' 
4aa10cd FindQt4: Set the INTERFACE_QT_MAJOR_VERSION for Qt4::QtCore
 2013-03-18 09:41:50 -04:00
Brad King
bb260f0927 Merge topic 'set-Qt4_FOUND' 
28d14f9 FindQt4: Set the Qt4_FOUND variable if Qt4 is found
 2013-03-18 09:41:41 -04:00
Brad King
a402bc4d5a Merge topic 'TI_DSP_to_TI' 
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
 2013-03-18 09:41:37 -04:00
Brad King
253d7b6fe4 Merge topic 'FindCUDA.cmake/SeparableCompilation' 
b6e9b8f FindCUDA: Use the PRE_LINK mode only for MSVC >= 10
 2013-03-18 09:41:28 -04:00
Stephen Kelly
78e6217f31 FPHSA: Fix FOUND_VAR check to work with if() auto-dereference 
Otherwise, it seems to match on the content of the variable.
 2013-03-18 09:35:07 -04:00
Stephen Kelly
4aa10cd6d6 FindQt4: Set the INTERFACE_QT_MAJOR_VERSION for Qt4::QtCore 
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)
 2013-03-18 09:31:33 -04:00
Stephen Kelly
28d14f9f13 FindQt4: Set the Qt4_FOUND variable if Qt4 is found 
Provide the old QT4_FOUND for compatibility.
 2013-03-18 09:30:47 -04:00
Clinton Stimpson
252bfd3379 FindQt4: If Qt5 is in CMAKE_PREFIX_PATH, be sure to find Qt4 includes. 2013-03-18 09:06:53 -04:00
Kitware Robot
ef63fa592a CMake Nightly Date Stamp 2013-03-18 00:01:04 -04:00
Kitware Robot
d7a2a9c319 CMake Nightly Date Stamp 2013-03-17 00:01:13 -04:00
Stephen Kelly
1b386b3407 Document that CMAKE_AUTOMOC works with Qt 5. 2013-03-16 19:31:04 +01:00
Kitware Robot
253a913654 CMake Nightly Date Stamp 2013-03-16 00:01:09 -04:00
Kitware Robot
03b0ceebe5 CMake Nightly Date Stamp 2013-03-15 00:01:08 -04:00
Alex Neundorf
27e6f6ef39 TI compiler: add automatic detection of prefix and suffixes 
The TI cross compilers are named e.g. cl6x or armcl, the accompanying
strip and ar have the same prefixes/suffixes.

Alex
 2013-03-14 21:48:09 +01:00
Alex Neundorf
b3015862e5 rename TI_DSP toolchain to TI, since it works also for the ARM compiler 
Additionally, look for a special ar and strip

Alex
 2013-03-14 21:47:59 +01:00
Alex Neundorf
12b25df882 Determine C/CXX/Fortran compiler: fix indentation 
Alex
 2013-03-14 21:47:49 +01:00
Alex Neundorf
7baa55ac0b Determine C/CXX/Fortran compiler: minor restructuring 
No functional changes, only change the way the if()-condition works,
to make it easier to add more cases.

Alex
 2013-03-14 21:47:38 +01:00
Brad King
55812ab0bc Merge topic 'configure-no-tests' 
dd8a06b Configure Tests/CMakeTests only with BUILD_TESTING ON
 2013-03-14 10:00:49 -04:00
Brad King
192ef7101e Merge topic 'aix-pic' 
5c8c1d6 XL: Use -qpic for position independent code (#14010)
 2013-03-14 10:00:35 -04:00
James Bigler
b6e9b8f127 FindCUDA: Use the PRE_LINK mode only for MSVC >= 10 
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.
 2013-03-14 09:57:15 -04:00
Kitware Robot
ae84d24b21 CMake Nightly Date Stamp 2013-03-14 00:01:10 -04:00
Matthew Woehlke
adeafad488 UseJava.cmake: accept jar targets in add_jar 
Modify add_jar to also accepts jars by target name.
 2013-03-13 17:34:50 -04:00
Matthew Woehlke
53a05b8f51 UseJava.cmake: fix passing jars to add_jar 
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.
 2013-03-13 17:30:16 -04:00
Matthew Woehlke
45c8e4b181 UseJava.cmake: simplify path logic 
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.
 2013-03-13 17:29:14 -04:00
Brad King
dd8a06bd65 Configure Tests/CMakeTests only with BUILD_TESTING ON 
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.
 2013-03-13 14:09:43 -04:00
Brad King
5c8c1d624d XL: Use -qpic for position independent code (#14010) 
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.
 2013-03-13 13:49:48 -04:00
Brad King
a95968fec9 Merge topic 'ninja-escape-line-breaks' 
3b4436a Ninja: escape line breaks in literals
 2013-03-13 13:42:00 -04:00
Brad King
18029b1e77 Merge topic 'findqt4-withqt5' 
161a793 FindQt4: Fix QT_QMAKE{_QMAKE => }_EXECUTABLE typo
 2013-03-13 13:37:26 -04:00
Brad King
0c1621ff95 Merge topic 'qt5-fixes' 
404e1d6 cmake-gui: Workaround bug in Qt 5.0.0 to 5.0.3 QStandardItemModel
5144f6f cmake-gui: Use -fPIE if required by Qt.
 2013-03-13 13:34:41 -04:00
Brad King
8128940ac1 Merge topic 'cleanup-early-include-CTest-failure' 
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
 2013-03-13 13:34:36 -04:00
Brad King
26bfece1af Merge topic 'fix-automoc-no-qt' 
a223a3b Automoc: Don't create automoc targets if Qt is not used (#13999)
65b5c1e Merge branch 'property-link-depends-no-crash' into fix-automoc-no-qt
 2013-03-13 13:34:24 -04:00
Brad King
9a02a26702 Merge topic 'property-link-depends-no-crash' 
ab079ee Avoid crash when checking property compatibility without link info
92a2ab7 Avoid crash when checking property link dependencies without link info
 2013-03-13 13:34:20 -04:00
Brad King
7d9d0efc7b Merge topic 'genex-SEMICOLON' 
7f3bb8b Add $<SEMICOLON> generator expression.
 2013-03-13 13:34:16 -04:00
Brad King
edf200a50b Merge topic 'ExternalData-escape-semicolons' 
1823ab4 ExternalData: Preserve escaped semicolons during argument expansion
 2013-03-13 13:34:06 -04:00
Brad King
0707e0d422 Merge topic 'add_subdirectory-trailing-slashes' 
1df4928 add_subdirectory: Compute output dir with consistent slashes (#10072)
 2013-03-13 13:34:02 -04:00
Brad King
26436346fb Merge topic 'doc-fixes' 
3cf2f67 Documentation: Clarify a few subtleties
 2013-03-13 13:33:53 -04:00