From ddbf84ef6ef85c2d9f7665a5340a8eb4de359e6d Mon Sep 17 00:00:00 2001 From: owent Date: Sat, 14 Apr 2018 17:01:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=8D=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 10 +++++----- include/include.macro.cmake | 4 ++-- include/libcopp/utils/config/compiler_features.h | 2 +- sample/CMakeLists.txt | 1 + sample/sample.custom-macro.cmake | 5 +++++ sample/sample.macro.cmake | 5 ----- src/CMakeLists.txt | 4 ++-- src/libcopp.macro.cmake | 6 +++--- src/libcopp/libcopp.lib.cmake | 2 +- src/libcotask/libcotask.lib.cmake | 2 +- test/CMakeLists.txt | 3 ++- test/test.custom-macro.cmake | 5 +++++ test/test.macro.cmake | 5 ----- 13 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 sample/sample.custom-macro.cmake delete mode 100644 sample/sample.macro.cmake create mode 100644 test/test.custom-macro.cmake delete mode 100644 test/test.macro.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 43bd358..7f46ec4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,13 +28,13 @@ include_macro_recurse(${CMAKE_CURRENT_LIST_DIR}) # feature detect include(WriteCompilerDetectionHeader) -if (NOT EXISTS "${PROJECT_ROOT_INC_DIR}/libcopp/utils/config") - file(MAKE_DIRECTORY "${PROJECT_ROOT_INC_DIR}/libcopp/utils/config") +if (NOT EXISTS "${PROJECT_LIBCOPP_ROOT_INC_DIR}/libcopp/utils/config") + file(MAKE_DIRECTORY "${PROJECT_LIBCOPP_ROOT_INC_DIR}/libcopp/utils/config") endif() # generate check header write_compiler_detection_header( - FILE "${PROJECT_ROOT_INC_DIR}/libcopp/utils/config/compiler_features.h" + FILE "${PROJECT_LIBCOPP_ROOT_INC_DIR}/libcopp/utils/config/compiler_features.h" PREFIX UTIL_CONFIG COMPILERS GNU Clang AppleClang MSVC FEATURES cxx_auto_type cxx_constexpr cxx_decltype cxx_decltype_auto cxx_defaulted_functions cxx_deleted_functions cxx_final cxx_override cxx_range_for cxx_noexcept cxx_nullptr cxx_rvalue_references cxx_static_assert cxx_thread_local cxx_variadic_templates cxx_lambdas @@ -47,8 +47,8 @@ else() endif() configure_file( - "${PROJECT_ROOT_INC_DIR}/libcopp/utils/config/build_feature.h.in" - "${PROJECT_ROOT_INC_DIR}/libcopp/utils/config/build_feature.h" + "${PROJECT_LIBCOPP_ROOT_INC_DIR}/libcopp/utils/config/build_feature.h.in" + "${PROJECT_LIBCOPP_ROOT_INC_DIR}/libcopp/utils/config/build_feature.h" @ONLY ) diff --git a/include/include.macro.cmake b/include/include.macro.cmake index cfd47a5..78f43ce 100644 --- a/include/include.macro.cmake +++ b/include/include.macro.cmake @@ -1,4 +1,4 @@ # =========== include - macro =========== -set (PROJECT_ROOT_INC_DIR ${CMAKE_CURRENT_LIST_DIR}) +set (PROJECT_LIBCOPP_ROOT_INC_DIR ${CMAKE_CURRENT_LIST_DIR}) -include_directories(${PROJECT_ROOT_INC_DIR}) \ No newline at end of file +include_directories(${PROJECT_LIBCOPP_ROOT_INC_DIR}) \ No newline at end of file diff --git a/include/libcopp/utils/config/compiler_features.h b/include/libcopp/utils/config/compiler_features.h index 9a26b76..20db898 100644 --- a/include/libcopp/utils/config/compiler_features.h +++ b/include/libcopp/utils/config/compiler_features.h @@ -76,7 +76,7 @@ # undef UTIL_CONFIG_COMPILER_IS_zOS # define UTIL_CONFIG_COMPILER_IS_zOS 1 -#elif defined(__IBMCPP__) && !defined(__COMPILER_VER__) && __IBMCPP__ >= 800 +#elif defined(__ibmxl__) || (defined(__IBMCPP__) && !defined(__COMPILER_VER__) && __IBMCPP__ >= 800) # undef UTIL_CONFIG_COMPILER_IS_XL # define UTIL_CONFIG_COMPILER_IS_XL 1 diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt index c9f2aad..95562ce 100644 --- a/sample/CMakeLists.txt +++ b/sample/CMakeLists.txt @@ -2,6 +2,7 @@ EchoWithColor(COLOR GREEN "-- Configure Sample Projects") +include ("${CMAKE_CURRENT_LIST_DIR}/sample.custom-macro.cmake") # ============ sample - [...] ============ file(GLOB SAMPLE_SRC_LIST RELATIVE "${PROJECT_SAMPLE_SRC_DIR}" diff --git a/sample/sample.custom-macro.cmake b/sample/sample.custom-macro.cmake new file mode 100644 index 0000000..5c7c014 --- /dev/null +++ b/sample/sample.custom-macro.cmake @@ -0,0 +1,5 @@ +# =========== sample =========== +set (PROJECT_SAMPLE_BAS_DIR ${CMAKE_CURRENT_LIST_DIR}) +set (PROJECT_SAMPLE_INC_DIR ${PROJECT_SAMPLE_BAS_DIR}) +set (PROJECT_SAMPLE_SRC_DIR ${PROJECT_SAMPLE_BAS_DIR}) + diff --git a/sample/sample.macro.cmake b/sample/sample.macro.cmake deleted file mode 100644 index a923d2c..0000000 --- a/sample/sample.macro.cmake +++ /dev/null @@ -1,5 +0,0 @@ -# =========== sample =========== -set (PROJECT_SAMPLE_BAS_DIR "${PROJECT_SOURCE_DIR}/sample") -set (PROJECT_SAMPLE_INC_DIR "${PROJECT_SAMPLE_BAS_DIR}") -set (PROJECT_SAMPLE_SRC_DIR "${PROJECT_SAMPLE_BAS_DIR}") - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1f33efa..9431c17 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,9 +2,9 @@ EchoWithColor(COLOR GREEN "-- Configure libraries") -add_subdirectory("${PROJECT_ROOT_SRC_DIR}/libcopp") +add_subdirectory("${PROJECT_LIBCOPP_ROOT_SRC_DIR}/libcopp") # ========= libcotask ========= if (LIBCOTASK_ENABLE) - add_subdirectory("${PROJECT_ROOT_SRC_DIR}/libcotask") + add_subdirectory("${PROJECT_LIBCOPP_ROOT_SRC_DIR}/libcotask") endif() diff --git a/src/libcopp.macro.cmake b/src/libcopp.macro.cmake index 014f670..427f46e 100644 --- a/src/libcopp.macro.cmake +++ b/src/libcopp.macro.cmake @@ -1,9 +1,9 @@ # =========== libcopp/src =========== -set (PROJECT_ROOT_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}") +set (PROJECT_LIBCOPP_ROOT_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}") -include("${PROJECT_ROOT_SRC_DIR}/libcopp/libcopp.lib.cmake") +include("${PROJECT_LIBCOPP_ROOT_SRC_DIR}/libcopp/libcopp.lib.cmake") # ========= libcotask ========= if (LIBCOTASK_ENABLE) - include("${PROJECT_ROOT_SRC_DIR}/libcotask/libcotask.lib.cmake") + include("${PROJECT_LIBCOPP_ROOT_SRC_DIR}/libcotask/libcotask.lib.cmake") endif() \ No newline at end of file diff --git a/src/libcopp/libcopp.lib.cmake b/src/libcopp/libcopp.lib.cmake index 5c3eb8e..9191b13 100644 --- a/src/libcopp/libcopp.lib.cmake +++ b/src/libcopp/libcopp.lib.cmake @@ -1,5 +1,5 @@ # =========== libcopp/src =========== -set (PROJECT_LIBCOPP_INC_DIR "${PROJECT_ROOT_INC_DIR}/libcopp") +set (PROJECT_LIBCOPP_INC_DIR "${PROJECT_LIBCOPP_ROOT_INC_DIR}/libcopp") set (PROJECT_LIBCOPP_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}") set (PROJECT_LIBCOPP_LIB_LINK copp) diff --git a/src/libcotask/libcotask.lib.cmake b/src/libcotask/libcotask.lib.cmake index cbfbdc0..46962f8 100644 --- a/src/libcotask/libcotask.lib.cmake +++ b/src/libcotask/libcotask.lib.cmake @@ -1,5 +1,5 @@ # =========== libcopp/src =========== -set (PROJECT_LIBCOTASK_INC_DIR "${PROJECT_ROOT_INC_DIR}/libcotask") +set (PROJECT_LIBCOTASK_INC_DIR "${PROJECT_LIBCOPP_ROOT_INC_DIR}/libcotask") set (PROJECT_LIBCOTASK_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}") set (PROJECT_LIBCOTASK_LIB_LINK cotask) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 59fce38..0f9141e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -42,9 +42,10 @@ elseif(LIBCOPP_TEST_ENABLE_BOOST_UNIT_TEST) endif() endif() +include("${CMAKE_CURRENT_LIST_DIR}/test.custom-macro.cmake") include_directories(${PROJECT_TEST_INC_DIR}) -file(GLOB_RECURSE COPP_TEST_SRC_LIST +file(GLOB_RECURSE COPP_TEST_SRC_LIST ${PROJECT_TEST_SRC_DIR}/*.h ${PROJECT_TEST_SRC_DIR}/*.hpp ${PROJECT_TEST_SRC_DIR}/*.c diff --git a/test/test.custom-macro.cmake b/test/test.custom-macro.cmake new file mode 100644 index 0000000..74175f6 --- /dev/null +++ b/test/test.custom-macro.cmake @@ -0,0 +1,5 @@ +# =========== test =========== +set (PROJECT_TEST_BAS_DIR ${CMAKE_CURRENT_LIST_DIR}) +set (PROJECT_TEST_SRC_DIR ${PROJECT_TEST_BAS_DIR}) +set (PROJECT_TEST_INC_DIR ${PROJECT_TEST_BAS_DIR}) + diff --git a/test/test.macro.cmake b/test/test.macro.cmake deleted file mode 100644 index ed8ad35..0000000 --- a/test/test.macro.cmake +++ /dev/null @@ -1,5 +0,0 @@ -# =========== test =========== -set (PROJECT_TEST_BAS_DIR "${PROJECT_SOURCE_DIR}/test") -set (PROJECT_TEST_SRC_DIR "${PROJECT_TEST_BAS_DIR}") -set (PROJECT_TEST_INC_DIR "${PROJECT_TEST_BAS_DIR}") -