From 03d5d3f2c01f372004440636f6d514a017f617a5 Mon Sep 17 00:00:00 2001 From: jinhai Date: Sun, 14 Apr 2019 10:23:10 +0800 Subject: [PATCH] Add conf to CMakeLists.txt Former-commit-id: 06d485991e06efb84e54e7ba6bbd0ae650442a59 --- cpp/CMakeLists.txt | 8 ++++++-- cpp/unittest/CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 27604b6d..c6b1eede 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -43,13 +43,17 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/" ${CMAKE_MODUL set(VECWISE_ENGINE_INCLUDE ${PROJECT_SOURCE_DIR}/include) set(VECWISE_ENGINE_SRC ${PROJECT_SOURCE_DIR}/src) -set(VECWISE_THIRD_PARTY ${CMAKE_CURRENT_SOURCE_DIR}/third_party/build) +set(VECWISE_THIRD_PARTY ${CMAKE_CURRENT_SOURCE_DIR}/third_party) +set(VECWISE_THIRD_PARTY_BUILD ${CMAKE_CURRENT_SOURCE_DIR}/third_party/build) add_compile_definitions(PROFILER=${PROFILER}) include_directories(${VECWISE_ENGINE_INCLUDE}) include_directories(${VECWISE_ENGINE_SRC}) -include_directories(${VECWISE_THIRD_PARTY}/include) +include_directories(${VECWISE_THIRD_PARTY_BUILD}/include) + +execute_process(COMMAND bash build.sh + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/third_party) add_subdirectory(src) diff --git a/cpp/unittest/CMakeLists.txt b/cpp/unittest/CMakeLists.txt index ab080d92..81749712 100644 --- a/cpp/unittest/CMakeLists.txt +++ b/cpp/unittest/CMakeLists.txt @@ -5,7 +5,7 @@ #------------------------------------------------------------------------------- link_directories( "${CMAKE_BINARY_DIR}/lib" - "${VECWISE_THIRD_PARTY}/lib" + "${VECWISE_THIRD_PARTY_BUILD}/lib" ) set(unittest_srcs -- GitLab