summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2017-05-27 22:16:57 -0700
committerGravatar Yuri Kunde Schlesner2017-05-27 22:16:57 -0700
commit4f84372bc20bbdc7a14e6d49edd1fda498a3ec54 (patch)
tree68c5caa41afc88c24fd8e82700d346f8a5712674
parentCMake: Add SoundTouch include path to target property (diff)
downloadyuzu-4f84372bc20bbdc7a14e6d49edd1fda498a3ec54.tar.gz
yuzu-4f84372bc20bbdc7a14e6d49edd1fda498a3ec54.tar.xz
yuzu-4f84372bc20bbdc7a14e6d49edd1fda498a3ec54.zip
CMake: Add cryptopp include path to target property
-rw-r--r--externals/cryptopp/CMakeLists.txt6
-rw-r--r--src/core/CMakeLists.txt1
2 files changed, 4 insertions, 3 deletions
diff --git a/externals/cryptopp/CMakeLists.txt b/externals/cryptopp/CMakeLists.txt
index 653af1e4b..864de18bb 100644
--- a/externals/cryptopp/CMakeLists.txt
+++ b/externals/cryptopp/CMakeLists.txt
@@ -10,6 +10,7 @@
10# - disabled installation 10# - disabled installation
11# - disabled documentation 11# - disabled documentation
12# - configured to build a static library only 12# - configured to build a static library only
13# - adds include directories to the library target
13 14
14include(TestBigEndian) 15include(TestBigEndian)
15include(CheckCXXCompilerFlag) 16include(CheckCXXCompilerFlag)
@@ -148,14 +149,15 @@ endif()
148# Compile targets 149# Compile targets
149#============================================================================ 150#============================================================================
150add_library(cryptopp STATIC ${cryptopp_SOURCES}) 151add_library(cryptopp STATIC ${cryptopp_SOURCES})
152target_include_directories(cryptopp INTERFACE .)
151 153
152#============================================================================ 154#============================================================================
153# Third-party libraries 155# Third-party libraries
154#============================================================================ 156#============================================================================
155 157
156if(WIN32) 158if(WIN32)
157 target_link_libraries(cryptopp ws2_32) 159 target_link_libraries(cryptopp PRIVATE ws2_32)
158endif() 160endif()
159 161
160find_package(Threads) 162find_package(Threads)
161target_link_libraries(cryptopp ${CMAKE_THREAD_LIBS_INIT}) 163target_link_libraries(cryptopp PRIVATE ${CMAKE_THREAD_LIBS_INIT})
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
375 ) 375 )
376 376
377include_directories(../../externals/dynarmic/include) 377include_directories(../../externals/dynarmic/include)
378include_directories(../../externals/cryptopp)
379 378
380create_directory_groups(${SRCS} ${HEADERS}) 379create_directory_groups(${SRCS} ${HEADERS})
381 380