Parcourir la source

[cmake] use current dirs

Andy Li il y a 7 ans
Parent
commit
e8175958c6
2 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. 2 2
      CMakeLists.txt
  2. 1 1
      libs/CMakeLists.txt

+ 2 - 2
CMakeLists.txt

@@ -16,7 +16,7 @@ if (MSVC)
     add_definitions(-DUNICODE -D_UNICODE)
 endif()
 
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/other/cmake ${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/other/cmake ${CMAKE_MODULE_PATH})
 
 if (CMAKE_VERSION VERSION_LESS "3.1")
     set (CMAKE_C_FLAGS "-std=c11 ${CMAKE_C_FLAGS}")
@@ -26,7 +26,7 @@ endif ()
 
 # put output in "bin"
 
-set(OUTPUT_DIR ${CMAKE_SOURCE_DIR}/bin)
+set(OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_DIR})

+ 1 - 1
libs/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(INCLUDES_BASE_DIR ${CMAKE_SOURCE_DIR}/include)
+set(INCLUDES_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../include)
 
 function(set_as_hdll target)
     set_target_properties(${target}.hdll