Просмотр исходного кода

Merge pull request #707 from SwiftEngineering/issue_706

Issue_706: Make resources path relative to current source and binary dir
Lee Thomason 7 лет назад
Родитель
Сommit
7e8e249990
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      CMakeLists.txt

+ 2 - 2
CMakeLists.txt

@@ -87,9 +87,9 @@ if(BUILD_TESTING AND BUILD_TESTS)
 
   # Copy test resources and create test output directory
   add_custom_command(TARGET xmltest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/resources $<TARGET_FILE_DIR:xmltest>/resources
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/resources $<TARGET_FILE_DIR:xmltest>/resources
     COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:xmltest>/resources/out
-    COMMENT "Configuring xmltest resources directory: ${CMAKE_BINARY_DIR}/resources"
+    COMMENT "Configuring xmltest resources directory: ${CMAKE_CURRENT_BINARY_DIR}/resources"
   )
 
   add_test(NAME xmltest COMMAND xmltest WORKING_DIRECTORY $<TARGET_FILE_DIR:xmltest>)