From ff14ae24399a4eeb3af75046285e09fba2a077ed Mon Sep 17 00:00:00 2001 From: David Cole Date: Wed, 27 Aug 2008 12:53:19 -0400 Subject: ENH: Changes that allow configuring/building BundleTest test separately from the main CMake build. (Eliminate reference to CMake_SOURE_DIR.) --- Tests/BundleTest/BundleSubDir/CMakeLists.txt | 6 +++--- Tests/BundleTest/CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Tests/BundleTest/BundleSubDir/CMakeLists.txt b/Tests/BundleTest/BundleSubDir/CMakeLists.txt index 3f7a5f1..322b2a7 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" - "${CMake_SOURCE_DIR}/ChangeLog.txt" + "${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS ) @@ -21,11 +21,11 @@ ADD_EXECUTABLE(SecondBundle MACOSX_BUNDLE "${BundleTest_SOURCE_DIR}/BundleTest.cxx" "${BundleTest_SOURCE_DIR}/SomeRandomFile.txt" - "${CMake_SOURCE_DIR}/ChangeLog.txt" + "${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" "${CMAKE_CURRENT_BINARY_DIR}/randomResourceFile.plist" ) TARGET_LINK_LIBRARIES(SecondBundle BundleTestLib) - + # Test bundle installation. INSTALL(TARGETS SecondBundle DESTINATION Applications) diff --git a/Tests/BundleTest/CMakeLists.txt b/Tests/BundleTest/CMakeLists.txt index 3f95afb..86e6232 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 - "${CMake_SOURCE_DIR}/ChangeLog.txt" + "${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" PROPERTIES MACOSX_PACKAGE_LOCATION MacOS ) @@ -30,7 +30,7 @@ ADD_EXECUTABLE(BundleTest MACOSX_BUNDLE BundleTest.cxx SomeRandomFile.txt - "${CMake_SOURCE_DIR}/ChangeLog.txt" + "${BundleTest_SOURCE_DIR}/../../ChangeLog.txt" "${CMAKE_CURRENT_BINARY_DIR}/randomResourceFile.plist" ) -- cgit v0.12