From 0f563111a2048228f10f5a565f57fc10bffd11e3 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sat, 27 May 2017 19:21:06 -0700 Subject: CMake: Use IMPORTED target for Boost --- src/core/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core') diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 7aa81e885..acc261e31 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -381,4 +381,4 @@ create_directory_groups(${SRCS} ${HEADERS}) add_library(core STATIC ${SRCS} ${HEADERS}) target_link_libraries(core PUBLIC common PRIVATE audio_core video_core) -target_link_libraries(core PRIVATE cryptopp dynarmic) +target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp dynarmic) -- cgit v1.2.3 From 4f84372bc20bbdc7a14e6d49edd1fda498a3ec54 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sat, 27 May 2017 22:16:57 -0700 Subject: CMake: Add cryptopp include path to target property --- src/core/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'src/core') diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index acc261e31..31152abd5 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -375,7 +375,6 @@ set(HEADERS ) include_directories(../../externals/dynarmic/include) -include_directories(../../externals/cryptopp) create_directory_groups(${SRCS} ${HEADERS}) -- cgit v1.2.3 From 3b68600f81078c5cc56f8697746d9ea5a4281d76 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sat, 27 May 2017 22:19:37 -0700 Subject: CMake: Remove unnecessary include_directories for dynarmic Dynarmic already adds the correct include paths to the library target. --- src/core/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/core') diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 31152abd5..3cdb2b817 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -374,10 +374,7 @@ set(HEADERS telemetry_session.h ) -include_directories(../../externals/dynarmic/include) - create_directory_groups(${SRCS} ${HEADERS}) - add_library(core STATIC ${SRCS} ${HEADERS}) target_link_libraries(core PUBLIC common PRIVATE audio_core video_core) target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp dynarmic) -- cgit v1.2.3