From 4fed16072030c3176e3ace1b270d3144b0714f99 Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周六, 14 3月 2020 12:15:04 +0800 Subject: [PATCH] improve includes --- src/library/CMakeLists.txt | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt index 9a70020..3ec8380 100644 --- a/src/library/CMakeLists.txt +++ b/src/library/CMakeLists.txt @@ -1,19 +1,25 @@ add_subdirectory("base") add_subdirectory("os") add_subdirectory("locate") -add_subdirectory("pc_identifier") +add_subdirectory("hw_identifier") ADD_LIBRARY(licensecc_static STATIC licensecc.cpp LicenseReader.cpp limits/license_verifier.cpp ini/ConvertUTF.c - $<TARGET_OBJECTS:pc_identifier> + $<TARGET_OBJECTS:hw_identifier> $<TARGET_OBJECTS:locate> $<TARGET_OBJECTS:os> $<TARGET_OBJECTS:base> ) +if(CODE_COVERAGE AND UNIX) + if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.13) + target_link_options(licensecc_static PUBLIC --coverage) + endif() + list(APPEND EXTERNAL_LIBS gcov) +endif(CODE_COVERAGE AND UNIX) define_property(TARGET PROPERTY WITH_OPENSSL BRIEF_DOCS "need openssl to compile" FULL_DOCS "ff") IF(UNIX OR OPENSSL_FOUND) @@ -26,9 +32,11 @@ ENDIF(UNIX OR OPENSSL_FOUND) target_include_directories(licensecc_static - INTERFACE + PUBLIC $<INSTALL_INTERFACE:include> + $<INSTALL_INTERFACE:include/${PROJECT_NAME}/${LCC_PROJECT_NAME}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include> + $<BUILD_INTERFACE:${LCC_INCLUDE_DIR}> ) add_library(licensecc::licensecc_static ALIAS licensecc_static) -- Gitblit v1.9.1