1.3.1

Author: owent

CHANGELOG.md

@@ -1,6 +1,12 @@
 HISTORY
 ----------------
 
+### 1.3.1 (2020-07-06)
+
+1. Fix compiler version checker for C++20 coroutine
+2. Add cmake interface option and features for targets
+3. Update documents
+
 ### 1.3.0 (2020-07-02)
 
 1. [OPTIMIZE] Using cmake export to generate module files

CMakeLists.txt

@@ -9,7 +9,7 @@ project(libcopp C CXX ASM)
 
 set(LIBCOPP_VERSION_MAJOR "1")
 set(LIBCOPP_VERSION_MINOR "3")
-set(LIBCOPP_VERSION_PATCH "0")
+set(LIBCOPP_VERSION_PATCH "1")
 set(LIBCOPP_VERSION "${LIBCOPP_VERSION_MAJOR}.${LIBCOPP_VERSION_MINOR}.${LIBCOPP_VERSION_PATCH}")
 
 ########################################################################

README.rst

@@ -195,44 +195,10 @@ Using with cmake
 .. code-block:: cmake
 
     find_package(Libcopp CONFIG REQUIRED)
-    target_link_libraries(${CUSTOM_TARGET_NAME} PUBLIC libcopp::cotask)
-    # Or just using copp by target_link_libraries(${CUSTOM_TARGET_NAME} PUBLIC libcopp::copp)
+    target_link_libraries(${CUSTOM_TARGET_NAME} libcopp::cotask)
+    # Or just using copp by target_link_libraries(${CUSTOM_TARGET_NAME} libcopp::copp)
 
-If using modern compilers, it's required to open **C++20 coroutine** support.These codes below may be helpful:
-
-.. code-block:: cmake
-
-    set_target_properties(
-        ${CUSTOM_TARGET_NAME}
-        PROPERTIES CXX_STANDARD 20
-    )
-    include(CheckCXXCompilerFlag)
-    if (MSVC AND MSVC_VERSION GREATER_EQUAL 1910)
-        check_cxx_compiler_flag("/await" CHECK_CXX_FLAGS_AWAIT)
-        if (CHECK_CXX_FLAGS_AWAIT)
-            target_compile_options(${CUSTOM_TARGET_NAME} PRIVATE /await)
-        endif()
-    elseif (
-        (${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "10.0.1") OR
-        (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "8.0")
-        )
-        check_cxx_compiler_flag("-fcoroutine" CHECK_CXX_FLAGS_FCONTEXT)
-        if (CHECK_CXX_FLAGS_FCONTEXT)
-            target_compile_options(${CUSTOM_TARGET_NAME} PRIVATE -fcoroutine)
-        else ()
-            check_cxx_compiler_flag("-fcoroutine-ts" CHECK_CXX_FLAGS_FCONTEXT_TS)
-            if (CHECK_CXX_FLAGS_FCONTEXT_TS)
-                target_compile_options(${CUSTOM_TARGET_NAME} PRIVATE -fcoroutine-ts)
-            endif()
-        endif()
-    elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "10.0")
-        check_cxx_compiler_flag("-fcoroutine" CHECK_CXX_FLAGS_FCONTEXT)
-        if (CHECK_CXX_FLAGS_FCONTEXT)
-            target_compile_options(${CUSTOM_TARGET_NAME} PRIVATE -fcoroutine)
-        endif ()
-    endif ()
-
-If using MSVC, CRT must match the triplet of vcpkg, these codes below may be helpful:
+If using MSVC and vcpkg, CRT must match the triplet of vcpkg, these codes below may be helpful:
 
 .. code-block:: cmake
 

project/cmake/CompilerOption.cmake

@@ -64,6 +64,36 @@ if(NOT DEFINED __COMPILER_OPTION_LOADED)
         endforeach()
     endmacro(add_linker_flags_for_all)
 
+    function(add_target_properties)
+        list(GET ARGV 0 TARGET_NAME)
+        list(GET ARGV 1 PROPERTY_NAME)
+        list(SUBLIST ARGV 2 -1 PROPERTY_VALUES)
+        if (TARGET ${TARGET_NAME} AND PROPERTY_VALUES)
+            get_target_property(PROPERTY_OLD_VALUES ${TARGET_NAME} ${PROPERTY_NAME})
+            if (PROPERTY_OLD_VALUES)
+                list(APPEND PROPERTY_OLD_VALUES ${PROPERTY_VALUES})
+            else ()
+                set(PROPERTY_OLD_VALUES ${PROPERTY_VALUES})
+            endif ()
+            set_target_properties(${TARGET_NAME} PROPERTIES ${PROPERTY_NAME} ${PROPERTY_OLD_VALUES})
+        endif ()
+    endfunction(add_target_properties)
+
+    function(remove_target_properties)
+        list(GET ARGV 0 TARGET_NAME)
+        list(GET ARGV 1 PROPERTY_NAME)
+        list(SUBLIST ARGV 2 -1 PROPERTY_VALUES)
+        if (TARGET ${TARGET_NAME} AND PROPERTY_VALUES)
+            get_target_property(PROPERTY_OLD_VALUES ${TARGET_NAME} ${PROPERTY_NAME})
+            if (PROPERTY_OLD_VALUES)
+                foreach(def ${PROPERTY_VALUES})
+                    list(REMOVE_ITEM PROPERTY_OLD_VALUES ${def})
+                    endforeach()
+                set_target_properties(${TARGET_NAME} PROPERTIES ${PROPERTY_NAME} ${PROPERTY_OLD_VALUES})
+            endif ()
+        endif ()
+    endfunction(remove_target_properties)
+
     # Auto compiler options, support gcc,MSVC,Clang,AppleClang
     if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
         # add_compile_options(-Wall -Werror)

src/libcopp/CMakeLists.txt

@@ -35,10 +35,10 @@ else ()
     )
 endif()
 
-target_include_directories(${PROJECT_LIBCOPP_LIB_LINK} 
+target_include_directories(${PROJECT_LIBCOPP_LIB_LINK}
+    INTERFACE "$<INSTALL_INTERFACE:include>"
     PUBLIC 
         "$<BUILD_INTERFACE:${PROJECT_LIBCOPP_ROOT_INC_DIR}>"
-        "$<INSTALL_INTERFACE:include>"
 )
 if (PROJECT_LIBCOPP_DEP_INC_DIR)
     target_include_directories(${PROJECT_LIBCOPP_LIB_LINK} 
@@ -47,6 +47,20 @@ if (PROJECT_LIBCOPP_DEP_INC_DIR)
     )
 endif()
 
+if (LIBCOPP_MACRO_ENABLE_STD_COROUTINE)
+    add_target_properties(${PROJECT_LIBCOPP_LIB_LINK} INTERFACE_COMPILE_FEATURES cxx_std_20)
+    if (MSVC)
+        add_target_properties(${PROJECT_LIBCOPP_LIB_LINK} INTERFACE_COMPILE_OPTIONS "/await")
+    else ()
+        string(FIND "${CMAKE_CXX_FLAGS}" "-fcoroutines-ts" LIBCOPP_FIND_COROUTINE_OPTION)
+        if (LIBCOPP_FIND_COROUTINE_OPTION GREATER_EQUAL 0)
+            add_target_properties(${PROJECT_LIBCOPP_LIB_LINK} INTERFACE_COMPILE_OPTIONS "-fcoroutines-ts")
+        else ()
+            add_target_properties(${PROJECT_LIBCOPP_LIB_LINK} INTERFACE_COMPILE_OPTIONS "-fcoroutines")
+        endif ()
+    endif ()
+endif ()
+
 install(TARGETS ${PROJECT_LIBCOPP_LIB_LINK}
     EXPORT ${PROJECT_LIBCOPP_EXPORT_NAME}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

src/libcotask/CMakeLists.txt

@@ -40,6 +40,23 @@ else ()
 endif()
 
 target_link_libraries(${PROJECT_LIBCOTASK_LIB_LINK} PUBLIC ${PROJECT_LIBCOPP_LIB_LINK})
+target_include_directories(${PROJECT_LIBCOPP_LIB_LINK}
+    INTERFACE "$<INSTALL_INTERFACE:include>"
+)
+
+if (LIBCOPP_MACRO_ENABLE_STD_COROUTINE)
+    add_target_properties(${PROJECT_LIBCOTASK_LIB_LINK} INTERFACE_COMPILE_FEATURES cxx_std_20)
+    if (MSVC)
+        add_target_properties(${PROJECT_LIBCOTASK_LIB_LINK} INTERFACE_COMPILE_OPTIONS "/await")
+    else ()
+        string(FIND "${CMAKE_CXX_FLAGS}" "-fcoroutines-ts" LIBCOPP_FIND_COROUTINE_OPTION)
+        if (LIBCOPP_FIND_COROUTINE_OPTION GREATER_EQUAL 0)
+            add_target_properties(${PROJECT_LIBCOTASK_LIB_LINK} INTERFACE_COMPILE_OPTIONS "-fcoroutines-ts")
+        else ()
+            add_target_properties(${PROJECT_LIBCOTASK_LIB_LINK} INTERFACE_COMPILE_OPTIONS "-fcoroutines")
+        endif ()
+    endif ()
+endif ()
 
 install(TARGETS ${PROJECT_LIBCOTASK_LIB_LINK}
     EXPORT ${PROJECT_LIBCOTASK_EXPORT_NAME}