From a5d87d6b600ea873468919c0e3ad4a42b30071bd Mon Sep 17 00:00:00 2001 From: Francesco Rigoni Date: Sun, 4 Mar 2018 20:33:53 +0100 Subject: [PATCH] Add target_include_directories --- CMakeLists.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d228f3e..b3f1163 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,11 +17,6 @@ set(SIMPLE_LOGGER_SRC ${source_dir}) ExternalProject_Get_Property(simple-logger binary_dir) set(SIMPLE_LOGGER_BIN ${binary_dir}) -# Add all include directories -include_directories(src/** ${SIMPLE_LOGGER_SRC}) -# Add paths for linker -link_directories(${SIMPLE_LOGGER_BIN}) - if (CMAKE_VERSION VERSION_LESS "3.1") if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set (CMAKE_CXX_FLAGS "--std=gnu++14 ${CMAKE_CXX_FLAGS}") @@ -30,11 +25,17 @@ else () set (CMAKE_CXX_STANDARD 14) endif () +# Add all include directories +include_directories(include/** ${SIMPLE_LOGGER_SRC}) +# Add paths for linker +link_directories(${SIMPLE_LOGGER_BIN}) + # All warnings on set (CMAKE_CXX_FLAGS "-Wall ${CMAKE_CXX_FLAGS}") file(GLOB sources_65816 src/*.cpp src/opcodes/*.cpp) add_library(65816 ${sources_65816}) - add_dependencies(65816 simple-logger) target_link_libraries(65816 simpleLogger) + +target_include_directories(65816 INTERFACE include/*)