From 3ef8955ebbceedbdca8537600c343353ce2aa48f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 13 Aug 2019 02:04:21 -0400 Subject: [PATCH] CMakeLists: Use target_sources instead of a variable Gets rid of the need to unset the PLAT_SRCS variable. We can just conditionally append the source files to the existing set of sources within the target. --- CMakeLists.txt | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e6c4c7..e485d27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,13 +7,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) unset(KABUFUDA_INCLUDE_DIR CACHE) #set(KABUFUDA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE PATH "kabufuda include path" FORCE) -unset(PLAT_SRCS) -if(WIN32) -list(APPEND PLAT_SRCS include/kabufuda/winsupport.hpp lib/kabufuda/AsyncIOWin32.cpp) -else() -list(APPEND PLAT_SRCS lib/kabufuda/AsyncIOPosix.cpp) -endif() - add_library(kabufuda STATIC include/kabufuda/Constants.hpp include/kabufuda/AsyncIO.hpp @@ -24,7 +17,19 @@ add_library(kabufuda STATIC include/kabufuda/Util.hpp lib/kabufuda/Util.cpp include/kabufuda/SRAM.hpp lib/kabufuda/SRAM.cpp include/kabufuda/WideStringConvert.hpp lib/kabufuda/WideStringConvert.cpp - ${PLAT_SRCS}) +) + +if(WIN32) + target_sources(kabufuda PRIVATE + include/kabufuda/winsupport.hpp + lib/kabufuda/AsyncIOWin32.cpp + ) +else() + target_sources(kabufuda PRIVATE + lib/kabufuda/AsyncIOPosix.cpp + ) +endif() + target_include_directories(kabufuda PUBLIC $) add_subdirectory(test)