diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-17 15:32:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-12-17 15:32:01 (GMT) |
| commit | ad25a968b9e47e9e966d166dd0e494dc684ebd66 (patch) | |
| tree | 5638f53977907708fd7473f5b3c9a582a36a1a92 /Tests/CMakeLists.txt | |
| parent | c128abe383e2f08e3f3e916f9b64356ca47056d1 (diff) | |
| parent | 78c86f454272a2ac417ad6a89e4c7ed7e4975adb (diff) | |
| download | CMake-ad25a968b9e47e9e966d166dd0e494dc684ebd66.zip CMake-ad25a968b9e47e9e966d166dd0e494dc684ebd66.tar.gz CMake-ad25a968b9e47e9e966d166dd0e494dc684ebd66.tar.bz2 | |
Merge branch 'ImprovedDotSupport2' into dev/strict-mode
Conflicts:
Source/cmake.cxx
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 5471052..02d393b 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -153,6 +153,9 @@ IF(BUILD_TESTING) ADD_TEST_MACRO(ExportImport ExportImport) ADD_TEST_MACRO(Unset Unset) ADD_TEST_MACRO(PolicyScope PolicyScope) + ADD_TEST_MACRO(EmptyLibrary EmptyLibrary) + SET_TESTS_PROPERTIES(EmptyLibrary PROPERTIES + PASS_REGULAR_EXPRESSION "CMake Error: CMake can not determine linker language for target:test") ADD_TEST_MACRO(CrossCompile CrossCompile) SET_TESTS_PROPERTIES(CrossCompile PROPERTIES PASS_REGULAR_EXPRESSION "TRY_RUN.. invoked in cross-compiling mode") @@ -1718,7 +1721,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ ENDIF() ENDIF() - IF(NOT CMAKE_TEST_GENERATOR MATCHES "Xcode") + if(NOT DEFINED CTEST_RUN_Java) + if(APPLE) + set(CTEST_RUN_Java OFF) + else() + set(CTEST_RUN_Java ON) + endif() + endif() + + IF(CTEST_RUN_Java) find_package(Java QUIET) IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW) GET_FILENAME_COMPONENT(JNIPATH ${JAVA_COMPILE} PATH) @@ -1742,7 +1753,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ ENDIF("${JNI_FILE}" MATCHES "JDK1_2") ENDIF(JNI_H) ENDIF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW) - ENDIF(NOT CMAKE_TEST_GENERATOR MATCHES "Xcode") + ENDIF(CTEST_RUN_Java) # add some cross compiler tests, for now only with makefile based generators IF(CMAKE_TEST_GENERATOR MATCHES "Makefiles" OR CMAKE_TEST_GENERATOR MATCHES "KDevelop") |