summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2017-05-27 18:26:55 -0700
committerGravatar Yuri Kunde Schlesner2017-05-27 18:41:24 -0700
commit7b81903756451281bd1f07d8e9a2dceeff79df08 (patch)
treeba001a9832ee8965963d17fd4e93e9222e1153de /src/video_core
parentCitra: Convert include into forward declaration (diff)
downloadyuzu-7b81903756451281bd1f07d8e9a2dceeff79df08.tar.gz
yuzu-7b81903756451281bd1f07d8e9a2dceeff79df08.tar.xz
yuzu-7b81903756451281bd1f07d8e9a2dceeff79df08.zip
CMake: Correct inter-module dependencies and library visibility
Modules didn't correctly define their dependencies before, which relied on the frontends implicitly including every module for linking to succeed. Also changed every target_link_libraries call to specify visibility of dependencies to avoid leaking definitions to dependents when not necessary.
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/CMakeLists.txt12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index e00b88f71..e455f03bd 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -79,13 +79,15 @@ endif()
79create_directory_groups(${SRCS} ${HEADERS}) 79create_directory_groups(${SRCS} ${HEADERS})
80 80
81add_library(video_core STATIC ${SRCS} ${HEADERS}) 81add_library(video_core STATIC ${SRCS} ${HEADERS})
82target_link_libraries(video_core glad) 82target_link_libraries(video_core PUBLIC common core)
83target_link_libraries(video_core PRIVATE glad)
84
83if (ARCHITECTURE_x86_64) 85if (ARCHITECTURE_x86_64)
84 target_link_libraries(video_core xbyak) 86 target_link_libraries(video_core PRIVATE xbyak)
85endif() 87endif()
86 88
87if (PNG_FOUND) 89if (PNG_FOUND)
88 target_link_libraries(video_core ${PNG_LIBRARIES}) 90 target_link_libraries(video_core PRIVATE ${PNG_LIBRARIES})
89 include_directories(${PNG_INCLUDE_DIRS}) 91 target_include_directories(video_core PRIVATE ${PNG_INCLUDE_DIRS})
90 add_definitions(${PNG_DEFINITIONS}) 92 target_compile_definitions(video_core PRIVATE ${PNG_DEFINITIONS})
91endif() 93endif()