diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-05-28 07:16:57 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-05-28 07:16:57 +0200 |
| commit | 4f84372bc20bbdc7a14e6d49edd1fda498a3ec54 (patch) | |
| tree | 68c5caa41afc88c24fd8e82700d346f8a5712674 | |
| parent | CMake: Add SoundTouch include path to target property (diff) | |
| download | yuzu-4f84372bc20bbdc7a14e6d49edd1fda498a3ec54.tar yuzu-4f84372bc20bbdc7a14e6d49edd1fda498a3ec54.tar.gz yuzu-4f84372bc20bbdc7a14e6d49edd1fda498a3ec54.tar.bz2 yuzu-4f84372bc20bbdc7a14e6d49edd1fda498a3ec54.tar.lz yuzu-4f84372bc20bbdc7a14e6d49edd1fda498a3ec54.tar.xz yuzu-4f84372bc20bbdc7a14e6d49edd1fda498a3ec54.tar.zst yuzu-4f84372bc20bbdc7a14e6d49edd1fda498a3ec54.zip | |
| -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 @@ # - disabled installation # - disabled documentation # - configured to build a static library only +# - adds include directories to the library target include(TestBigEndian) include(CheckCXXCompilerFlag) @@ -148,14 +149,15 @@ endif() # Compile targets #============================================================================ add_library(cryptopp STATIC ${cryptopp_SOURCES}) +target_include_directories(cryptopp INTERFACE .) #============================================================================ # Third-party libraries #============================================================================ if(WIN32) - target_link_libraries(cryptopp ws2_32) + target_link_libraries(cryptopp PRIVATE ws2_32) endif() find_package(Threads) -target_link_libraries(cryptopp ${CMAKE_THREAD_LIBS_INIT}) +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 ) include_directories(../../externals/dynarmic/include) -include_directories(../../externals/cryptopp) create_directory_groups(${SRCS} ${HEADERS}) |