diff options
| author | 2017-05-27 22:16:57 -0700 | |
|---|---|---|
| committer | 2017-05-27 22:16:57 -0700 | |
| commit | 4f84372bc20bbdc7a14e6d49edd1fda498a3ec54 (patch) | |
| tree | 68c5caa41afc88c24fd8e82700d346f8a5712674 | |
| parent | CMake: Add SoundTouch include path to target property (diff) | |
| download | yuzu-4f84372bc20bbdc7a14e6d49edd1fda498a3ec54.tar.gz yuzu-4f84372bc20bbdc7a14e6d49edd1fda498a3ec54.tar.xz yuzu-4f84372bc20bbdc7a14e6d49edd1fda498a3ec54.zip | |
CMake: Add cryptopp include path to target property
| -rw-r--r-- | externals/cryptopp/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 1 |
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 | ||
| 14 | include(TestBigEndian) | 15 | include(TestBigEndian) |
| 15 | include(CheckCXXCompilerFlag) | 16 | include(CheckCXXCompilerFlag) |
| @@ -148,14 +149,15 @@ endif() | |||
| 148 | # Compile targets | 149 | # Compile targets |
| 149 | #============================================================================ | 150 | #============================================================================ |
| 150 | add_library(cryptopp STATIC ${cryptopp_SOURCES}) | 151 | add_library(cryptopp STATIC ${cryptopp_SOURCES}) |
| 152 | target_include_directories(cryptopp INTERFACE .) | ||
| 151 | 153 | ||
| 152 | #============================================================================ | 154 | #============================================================================ |
| 153 | # Third-party libraries | 155 | # Third-party libraries |
| 154 | #============================================================================ | 156 | #============================================================================ |
| 155 | 157 | ||
| 156 | if(WIN32) | 158 | if(WIN32) |
| 157 | target_link_libraries(cryptopp ws2_32) | 159 | target_link_libraries(cryptopp PRIVATE ws2_32) |
| 158 | endif() | 160 | endif() |
| 159 | 161 | ||
| 160 | find_package(Threads) | 162 | find_package(Threads) |
| 161 | target_link_libraries(cryptopp ${CMAKE_THREAD_LIBS_INIT}) | 163 | target_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 | ||
| 377 | include_directories(../../externals/dynarmic/include) | 377 | include_directories(../../externals/dynarmic/include) |
| 378 | include_directories(../../externals/cryptopp) | ||
| 379 | 378 | ||
| 380 | create_directory_groups(${SRCS} ${HEADERS}) | 379 | create_directory_groups(${SRCS} ${HEADERS}) |
| 381 | 380 | ||