From ad0b8446728fbde50205b5e8413d6a00adebb6d4 Mon Sep 17 00:00:00 2001 From: Cynthia Date: Tue, 13 Mar 2018 21:13:38 +0100 Subject: [PATCH] Changed CMAKE_SOURCE_DIR to CMAKE_CURRENT_SOURCE_DIR (#143) Helps with submodule implementations --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e5e1ba..5dad9e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,23 +28,23 @@ endif(CLANG_FORMAT_CMD) # thirdparty stuff execute_process( - COMMAND mkdir ${CMAKE_SOURCE_DIR}/thirdparty + COMMAND mkdir ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty ERROR_QUIET ) -find_file(RAPIDJSONTEST NAMES rapidjson rapidjson-1.1.0 PATHS ${CMAKE_SOURCE_DIR}/thirdparty CMAKE_FIND_ROOT_PATH_BOTH) +find_file(RAPIDJSONTEST NAMES rapidjson rapidjson-1.1.0 PATHS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty CMAKE_FIND_ROOT_PATH_BOTH) if (NOT RAPIDJSONTEST) message("no rapidjson, download") - set(RJ_TAR_FILE ${CMAKE_SOURCE_DIR}/thirdparty/v1.1.0.tar.gz) + set(RJ_TAR_FILE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/v1.1.0.tar.gz) file(DOWNLOAD https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz ${RJ_TAR_FILE}) execute_process( COMMAND ${CMAKE_COMMAND} -E tar xzf ${RJ_TAR_FILE} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/thirdparty + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty ) file(REMOVE ${RJ_TAR_FILE}) endif(NOT RAPIDJSONTEST) -find_file(RAPIDJSON NAMES rapidjson rapidjson-1.1.0 PATHS ${CMAKE_SOURCE_DIR}/thirdparty CMAKE_FIND_ROOT_PATH_BOTH) +find_file(RAPIDJSON NAMES rapidjson rapidjson-1.1.0 PATHS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty CMAKE_FIND_ROOT_PATH_BOTH) add_library(rapidjson STATIC IMPORTED ${RAPIDJSON})