瀏覽代碼

changes to allow embedding

changes several usages of CMAKE_SOURCE_DIR to CMAKE_CURRENT_SOURCE_DIR which allow embedding the assimp build in a larger CMake project

... as an alternative to dependency-hell
Peter LaValle 10 年之前
父節點
當前提交
a00101cc02
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      CMakeLists.txt

+ 2 - 2
CMakeLists.txt

@@ -23,7 +23,7 @@ add_definitions( -DOPENDDL_NO_USE_CPP11 )
 # Get the current working branch
 # Get the current working branch
 execute_process(
 execute_process(
     COMMAND git rev-parse --abbrev-ref HEAD
     COMMAND git rev-parse --abbrev-ref HEAD
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     OUTPUT_VARIABLE GIT_BRANCH
     OUTPUT_VARIABLE GIT_BRANCH
     OUTPUT_STRIP_TRAILING_WHITESPACE
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 )
@@ -31,7 +31,7 @@ execute_process(
 # Get the latest abbreviated commit hash of the working branch
 # Get the latest abbreviated commit hash of the working branch
 execute_process(
 execute_process(
     COMMAND git log -1 --format=%h
     COMMAND git log -1 --format=%h
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     OUTPUT_VARIABLE GIT_COMMIT_HASH
     OUTPUT_VARIABLE GIT_COMMIT_HASH
     OUTPUT_STRIP_TRAILING_WHITESPACE
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 )