From f9998996a50390b4b2eedd0203b0b66c9f7ec5db Mon Sep 17 00:00:00 2001 From: An Tao Date: Fri, 4 Oct 2019 22:24:34 +0800 Subject: [PATCH] Modify cmake configuration (#271) --- CMakeLists.txt | 1 + cmake/templates/DrogonConfig.cmake.in | 2 -- trantor | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a38ec71d..28b6d56f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -284,6 +284,7 @@ target_sources(${PROJECT_NAME} PRIVATE ${DROGON_SOURCES}) set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD ${DROGON_CXX_STANDARD}) set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD_REQUIRED ON) set_target_properties(${PROJECT_NAME} PROPERTIES CXX_EXTENSIONS OFF) +set_target_properties(${PROJECT_NAME} PROPERTIES EXPORT_NAME Drogon) add_dependencies(${PROJECT_NAME} makeVersion) diff --git a/cmake/templates/DrogonConfig.cmake.in b/cmake/templates/DrogonConfig.cmake.in index 8985365c..1d2bacaa 100644 --- a/cmake/templates/DrogonConfig.cmake.in +++ b/cmake/templates/DrogonConfig.cmake.in @@ -19,8 +19,6 @@ endif() get_filename_component(DROGON_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) if(NOT TARGET Drogon::Drogon) include("${DROGON_CMAKE_DIR}/DrogonTargets.cmake") - set_target_properties(Drogon::drogon PROPERTIES IMPORTED_GLOBAL TRUE) - add_library(Drogon::Drogon ALIAS Drogon::drogon) endif() get_target_property(DROGON_INCLUDE_DIRS Drogon::Drogon INTERFACE_INCLUDE_DIRECTORIES) diff --git a/trantor b/trantor index 99ba85bd..01d39264 160000 --- a/trantor +++ b/trantor @@ -1 +1 @@ -Subproject commit 99ba85bd4c252b7003e73eef50c862d51c23e4e0 +Subproject commit 01d39264350bb972c8c91df6f7055a27b2e8050f