diff options
| author | 2017-05-29 15:12:21 -0700 | |
|---|---|---|
| committer | 2017-05-29 15:12:21 -0700 | |
| commit | a4f88c7d7c94107df6bfada31617ff553bb5e89e (patch) | |
| tree | cb0d3adbbe115604051300ae451a22a4de751b27 /src/video_core | |
| parent | Merge pull request #2729 from yuriks/quaternion-fix (diff) | |
| parent | CMake: Re-organize root CMakeLists.txt file (diff) | |
| download | yuzu-a4f88c7d7c94107df6bfada31617ff553bb5e89e.tar.gz yuzu-a4f88c7d7c94107df6bfada31617ff553bb5e89e.tar.xz yuzu-a4f88c7d7c94107df6bfada31617ff553bb5e89e.zip | |
Merge pull request #2734 from yuriks/cmake-imported-libs
CMake: Use CMake target properties for all libraries
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index e455f03bd..0961a3251 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt | |||
| @@ -80,14 +80,13 @@ create_directory_groups(${SRCS} ${HEADERS}) | |||
| 80 | 80 | ||
| 81 | add_library(video_core STATIC ${SRCS} ${HEADERS}) | 81 | add_library(video_core STATIC ${SRCS} ${HEADERS}) |
| 82 | target_link_libraries(video_core PUBLIC common core) | 82 | target_link_libraries(video_core PUBLIC common core) |
| 83 | target_link_libraries(video_core PRIVATE glad) | 83 | target_link_libraries(video_core PRIVATE glad nihstro-headers) |
| 84 | 84 | ||
| 85 | if (ARCHITECTURE_x86_64) | 85 | if (ARCHITECTURE_x86_64) |
| 86 | target_link_libraries(video_core PRIVATE xbyak) | 86 | target_link_libraries(video_core PRIVATE xbyak) |
| 87 | endif() | 87 | endif() |
| 88 | 88 | ||
| 89 | if (PNG_FOUND) | 89 | if (PNG_FOUND) |
| 90 | target_link_libraries(video_core PRIVATE ${PNG_LIBRARIES}) | 90 | target_link_libraries(video_core PRIVATE PNG::PNG) |
| 91 | target_include_directories(video_core PRIVATE ${PNG_INCLUDE_DIRS}) | 91 | target_compile_definitions(video_core PRIVATE HAVE_PNG) |
| 92 | target_compile_definitions(video_core PRIVATE ${PNG_DEFINITIONS}) | ||
| 93 | endif() | 92 | endif() |