Ver código fonte

ENH: Changes that allow configuring/building BundleTest test separately from the main CMake build. (Eliminate reference to CMake_SOURE_DIR.)

David Cole 17 anos atrás
pai
commit
ff14ae2439

+ 3 - 3
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)
 

+ 2 - 2
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"
   )