From 339d1c18545e63c77e3cac2fe56e5ad297ddf3a9 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 23 Sep 2021 10:59:24 +0800 Subject: [PATCH] refact --- CMakeLists.txt | 8 ++++---- cmake/lz4_CMakeLists.txt.in | 2 +- deps/CMakeLists.txt | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cabcc5644..dbd0531b3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,18 +20,18 @@ set(DEPS_TMP_FILE "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in") configure_file("${CMAKE_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${DEPS_TMP_FILE}) ## googletest -option(BUILD_TEST "If build unit tests using googletest" ON) +option(BUILD_TEST "If build unit tests using googletest" OFF) if(${BUILD_TEST}) cat("${CMAKE_SUPPORT_DIR}/gtest_CMakeLists.txt.in" ${DEPS_TMP_FILE}) endif(${BUILD_TEST}) -## cJson -cat("${CMAKE_SUPPORT_DIR}/cjson_CMakeLists.txt.in" ${DEPS_TMP_FILE}) - ## lz4 cat("${CMAKE_SUPPORT_DIR}/lz4_CMakeLists.txt.in" ${DEPS_TMP_FILE}) +## cJson +cat("${CMAKE_SUPPORT_DIR}/cjson_CMakeLists.txt.in" ${DEPS_TMP_FILE}) + ## download dependencies configure_file(${DEPS_TMP_FILE} "${CMAKE_SOURCE_DIR}/deps/deps-download/CMakeLists.txt") execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" . diff --git a/cmake/lz4_CMakeLists.txt.in b/cmake/lz4_CMakeLists.txt.in index dc3b17ea21..2f3cdc0d89 100644 --- a/cmake/lz4_CMakeLists.txt.in +++ b/cmake/lz4_CMakeLists.txt.in @@ -5,7 +5,7 @@ ExternalProject_Add(lz4 GIT_TAG v1.9.3 SOURCE_DIR "${CMAKE_SOURCE_DIR}/deps/lz4" BINARY_DIR "${CMAKE_BINARY_DIR}/lz4-build" - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_SOURCE_DIR}/build/cmake + CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_COMMAND "" TEST_COMMAND "" diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index bb3a1c2bbc..1d8eac00aa 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -3,3 +3,4 @@ if(${BUILD_TEST}) endif(${BUILD_TEST}) add_subdirectory(cJson) +add_subdirectory(lz4/build/cmake)