From a0b74b09a5824d50613e3b3a5590e7a9ed515716 Mon Sep 17 00:00:00 2001 From: Wenfeng CAI <xoxyzox-m@yahoo.com> Date: 周二, 13 11月 2018 10:51:36 +0800 Subject: [PATCH] Fix assumed return type of MSVC --- src/library/CMakeLists.txt | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt index 4322104..1b679f5 100644 --- a/src/library/CMakeLists.txt +++ b/src/library/CMakeLists.txt @@ -1,14 +1,11 @@ -IF(WIN32) - add_subdirectory("os/win") -ELSE(WIN32) - add_subdirectory("os/linux") -ENDIF(WIN32) -add_subdirectory("base") -add_subdirectory("ini") +add_subdirectory("os") +add_subdirectory("base") +add_subdirectory("ini") ADD_LIBRARY(license++_static STATIC license++.cpp LicenseReader.cpp + pc-identifiers.c ) target_link_libraries( @@ -17,3 +14,7 @@ os ) +install(TARGETS license++_static ARCHIVE DESTINATION lib) +install(FILES api/datatypes.h api/license++.h DESTINATION include/api) +install(FILES base/base.h DESTINATION include/base) +install(FILES pc-identifiers.h DESTINATION include/) -- Gitblit v1.9.1