diff options
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/BundleTest/BundleSubDir/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/BundleTest/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/Framework/CMakeLists.txt | 5 |
4 files changed, 11 insertions, 8 deletions
diff --git a/Tests/BundleTest/BundleSubDir/CMakeLists.txt b/Tests/BundleTest/BundleSubDir/CMakeLists.txt index 299c42e..3f7a5f1 100644 --- a/Tests/BundleTest/BundleSubDir/CMakeLists.txt +++ b/Tests/BundleTest/BundleSubDir/CMakeLists.txt @@ -27,7 +27,7 @@ ADD_EXECUTABLE(SecondBundle TARGET_LINK_LIBRARIES(SecondBundle BundleTestLib) # Test bundle installation. -INSTALL(TARGETS SecondBundle DESTINATION Application) +INSTALL(TARGETS SecondBundle DESTINATION Applications) # Test whether bundles respect the output name. Since the library is # installed into a location that uses this output name this will fail if the diff --git a/Tests/BundleTest/CMakeLists.txt b/Tests/BundleTest/CMakeLists.txt index ff9626f..2eec9ea 100644 --- a/Tests/BundleTest/CMakeLists.txt +++ b/Tests/BundleTest/CMakeLists.txt @@ -36,9 +36,9 @@ ADD_EXECUTABLE(BundleTest TARGET_LINK_LIBRARIES(BundleTest BundleTestLib) # Test bundle installation. -#INSTALL(TARGETS BundleTestLib DESTINATION Application/BundleTestExe.app/Contents/Plugins) -INSTALL(TARGETS BundleTestLib DESTINATION Application/SecondBundleExe.app/Contents/Plugins) -INSTALL(TARGETS BundleTest DESTINATION Application) +#INSTALL(TARGETS BundleTestLib DESTINATION Applications/BundleTestExe.app/Contents/Plugins) +INSTALL(TARGETS BundleTestLib DESTINATION Applications/SecondBundleExe.app/Contents/Plugins) +INSTALL(TARGETS BundleTest DESTINATION Applications) # Test whether bundles respect the output name. Since the library is # installed into a location that uses this output name this will fail if the @@ -59,7 +59,7 @@ INCLUDE(CPack) # test the framework find stuff IF(EXISTS /usr/lib/libtcl.dylib - AND EXISTS /System/Library/Frameworks/tcl.framework) + AND EXISTS /System/Library/Frameworks/Tcl.framework) SET(TCL NOTFOUND) FIND_LIBRARY(TCL tcl) MESSAGE("frame: ${TCL}") @@ -87,6 +87,6 @@ IF(EXISTS /usr/lib/libtcl.dylib ENDIF(NOT "${TCL}" MATCHES .framework) MESSAGE("frame: ${TCL}") ENDIF(EXISTS /usr/lib/libtcl.dylib - AND EXISTS /System/Library/Frameworks/tcl.framework) + AND EXISTS /System/Library/Frameworks/Tcl.framework) SUBDIRS(BundleSubDir) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 9e530d3..eb5267f 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -597,7 +597,7 @@ IF(BUILD_TESTING) --build-options "-DCMAKE_INSTALL_PREFIX:PATH=${BundleTestInstallDir}" "-DCMake_SOURCE_DIR:PATH=${CMAKE_SOURCE_DIR}" --test-command - ${BundleTestInstallDir}/Application/SecondBundleExe.app/Contents/MacOS/SecondBundleExe) + ${BundleTestInstallDir}/Applications/SecondBundleExe.app/Contents/MacOS/SecondBundleExe) ADD_TEST_MACRO(ObjC++ ObjC++) ENDIF (APPLE AND CMAKE_COMPILER_IS_GNUCXX) diff --git a/Tests/Framework/CMakeLists.txt b/Tests/Framework/CMakeLists.txt index f1f82cb..57028d7 100644 --- a/Tests/Framework/CMakeLists.txt +++ b/Tests/Framework/CMakeLists.txt @@ -27,7 +27,10 @@ set_source_files_properties(test.lua PROPERTIES ) add_executable(bar bar.cxx) target_link_libraries(bar foo) - +install(TARGETS foo bar + RUNTIME DESTINATION /Applications/CMakeTestsFramework/bin + FRAMEWORK DESTINATION /Library/Frameworks +) # Make a static library and apply the framework properties to it to verify # that everything still builds correctly, but it will not actually produce |