diff options
Diffstat (limited to 'Tests')
13 files changed, 30 insertions, 8 deletions
diff --git a/Tests/BundleTest/BundleLib.cxx b/Tests/BundleTest/BundleLib.cxx index b68ee25dde..37bc178d63 100644 --- a/Tests/BundleTest/BundleLib.cxx +++ b/Tests/BundleTest/BundleLib.cxx @@ -58,7 +58,7 @@ int foo(char *exec) int res1 = findBundleFile(exec, "Resources/randomResourceFile.plist"); int res2 = findBundleFile(exec, "MacOS/SomeRandomFile.txt"); - int res3 = findBundleFile(exec, "MacOS/ChangeLog.txt"); + int res3 = findBundleFile(exec, "MacOS/README.rst"); if ( !res1 || !res2 || !res3 ) diff --git a/Tests/BundleTest/BundleSubDir/CMakeLists.txt b/Tests/BundleTest/BundleSubDir/CMakeLists.txt index 1921ce0950..43c366a09d 100644 --- a/Tests/BundleTest/BundleSubDir/CMakeLists.txt +++ b/Tests/BundleTest/BundleSubDir/CMakeLists.txt @@ -12,7 +12,7 @@ set_source_files_properties( set_source_files_properties( "${BundleTest_SOURCE_DIR}/SomeRandomFile.txt" - "${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" + "${BundleTest_SOURCE_DIR}/../../README.rst" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS ) @@ -21,7 +21,7 @@ add_executable(SecondBundle MACOSX_BUNDLE "${BundleTest_SOURCE_DIR}/BundleTest.cxx" "${BundleTest_SOURCE_DIR}/SomeRandomFile.txt" - "${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" + "${BundleTest_SOURCE_DIR}/../../README.rst" "${CMAKE_CURRENT_BINARY_DIR}/randomResourceFile.plist" ) target_link_libraries(SecondBundle BundleTestLib) diff --git a/Tests/BundleTest/CMakeLists.txt b/Tests/BundleTest/CMakeLists.txt index de69d75558..853da35383 100644 --- a/Tests/BundleTest/CMakeLists.txt +++ b/Tests/BundleTest/CMakeLists.txt @@ -17,7 +17,7 @@ set_source_files_properties( set_source_files_properties( SomeRandomFile.txt - "${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" + "${BundleTest_SOURCE_DIR}/../../README.rst" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS ) @@ -38,7 +38,7 @@ add_executable(BundleTest MACOSX_BUNDLE BundleTest.cxx SomeRandomFile.txt - "${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" + "${BundleTest_SOURCE_DIR}/../../README.rst" "${CMAKE_CURRENT_BINARY_DIR}/randomResourceFile.plist" ) target_link_libraries(BundleTest BundleTestLib) diff --git a/Tests/CPackWiXGenerator/CMakeLists.txt b/Tests/CPackWiXGenerator/CMakeLists.txt index bc3322ef3f..d673d145d9 100644 --- a/Tests/CPackWiXGenerator/CMakeLists.txt +++ b/Tests/CPackWiXGenerator/CMakeLists.txt @@ -49,6 +49,11 @@ set(CPACK_PACKAGE_EXECUTABLES "my-other-app" "Second CPack WiX Test" ) +set(CPACK_CREATE_DESKTOP_LINKS + "my-libapp" + "my-other-app" +) + set(CPACK_WIX_PATCH_FILE "${CMAKE_CURRENT_SOURCE_DIR}/patch.xml") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/license.txt") diff --git a/Tests/RunCMake/CheckModules/CMakeLists.txt b/Tests/RunCMake/CheckModules/CMakeLists.txt index 65ac8e8db3..72abfc8099 100644 --- a/Tests/RunCMake/CheckModules/CMakeLists.txt +++ b/Tests/RunCMake/CheckModules/CMakeLists.txt @@ -1,3 +1,3 @@ cmake_minimum_required(VERSION 2.8.11) -project(${RunCMake_TEST}) +project(${RunCMake_TEST} NONE) include(${RunCMake_TEST}.cmake) diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberOk.cmake b/Tests/RunCMake/CheckModules/CheckStructHasMemberOk.cmake index b319e18f28..4c064c5010 100644 --- a/Tests/RunCMake/CheckModules/CheckStructHasMemberOk.cmake +++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberOk.cmake @@ -1,3 +1,5 @@ +enable_language(C) +enable_language(CXX) include(CheckStructHasMember) check_struct_has_member("struct timeval" tv_sec sys/select.h HAVE_TIMEVAL_TV_SEC) check_struct_has_member("struct timeval" tv_sec sys/select.h HAVE_TIMEVAL_TV_SEC_C LANGUAGE C) diff --git a/Tests/RunCMake/CheckModules/CheckTypeSizeOk.cmake b/Tests/RunCMake/CheckModules/CheckTypeSizeOk.cmake index 558f07e4bb..45a4978fcf 100644 --- a/Tests/RunCMake/CheckModules/CheckTypeSizeOk.cmake +++ b/Tests/RunCMake/CheckModules/CheckTypeSizeOk.cmake @@ -1,3 +1,5 @@ +enable_language(C) +enable_language(CXX) include(CheckTypeSize) check_type_size(int SIZEOF_INT) check_type_size(int SIZEOF_INT BUILTIN_TYPES_ONLY) diff --git a/Tests/RunCMake/interface_library/RunCMakeTest.cmake b/Tests/RunCMake/interface_library/RunCMakeTest.cmake index 9ca9a77143..3c457c5bac 100644 --- a/Tests/RunCMake/interface_library/RunCMakeTest.cmake +++ b/Tests/RunCMake/interface_library/RunCMakeTest.cmake @@ -5,5 +5,6 @@ run_cmake(target_commands) run_cmake(no_shared_libs) run_cmake(whitelist) run_cmake(invalid_signature) +run_cmake(global-interface) run_cmake(genex_link) run_cmake(add_dependencies) diff --git a/Tests/RunCMake/interface_library/global-interface-result.txt b/Tests/RunCMake/interface_library/global-interface-result.txt new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/Tests/RunCMake/interface_library/global-interface-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/interface_library/global-interface-stderr.txt b/Tests/RunCMake/interface_library/global-interface-stderr.txt new file mode 100644 index 0000000000..24edd0f898 --- /dev/null +++ b/Tests/RunCMake/interface_library/global-interface-stderr.txt @@ -0,0 +1,9 @@ +CMake Error at global-interface.cmake:2 \(add_library\): + Cannot find source file: + + GLOBAL + + Tried extensions \.c \.C \.c\+\+ \.cc \.cpp \.cxx \.m \.M \.mm \.h \.hh \.h\+\+ \.hm \.hpp + \.hxx \.in \.txx +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/interface_library/global-interface.cmake b/Tests/RunCMake/interface_library/global-interface.cmake new file mode 100644 index 0000000000..d2bfc64ed9 --- /dev/null +++ b/Tests/RunCMake/interface_library/global-interface.cmake @@ -0,0 +1,2 @@ + +add_library(iface GLOBAL INTERFACE) diff --git a/Tests/RunCMake/interface_library/invalid_signature-stderr.txt b/Tests/RunCMake/interface_library/invalid_signature-stderr.txt index 701586a8d3..6374b3392b 100644 --- a/Tests/RunCMake/interface_library/invalid_signature-stderr.txt +++ b/Tests/RunCMake/interface_library/invalid_signature-stderr.txt @@ -84,6 +84,6 @@ Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) + CMake Error at invalid_signature.cmake:20 \(add_library\): - add_library INTERFACE library requires no source arguments. + add_library GLOBAL option may only be used with IMPORTED libraries. Call Stack \(most recent call first\): CMakeLists.txt:3 \(include\) diff --git a/Tests/RunCMake/interface_library/invalid_signature.cmake b/Tests/RunCMake/interface_library/invalid_signature.cmake index 67e3267439..4e53534b28 100644 --- a/Tests/RunCMake/interface_library/invalid_signature.cmake +++ b/Tests/RunCMake/interface_library/invalid_signature.cmake @@ -16,5 +16,5 @@ add_library(iface15 ALIAS INTERFACE) add_library(iface16 INTERFACE INTERFACE) add_library(iface17 INTERFACE EXCLUDE_FROM_ALL) add_library(iface18 EXCLUDE_FROM_ALL INTERFACE) -add_library(iface19 GLOBAL INTERFACE) +# add_library(iface19 GLOBAL INTERFACE) Tested separately add_library(iface20 INTERFACE GLOBAL) |