mirror of
https://github.com/stenzek/duckstation.git
synced 2026-02-15 02:44:41 +00:00
CMake: Prefer private over public include dirs
This commit is contained in:
@@ -9,4 +9,5 @@ add_executable(common-tests
|
||||
string_tests.cpp
|
||||
)
|
||||
|
||||
target_include_directories(common-tests PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
target_link_libraries(common-tests PRIVATE common gtest gtest_main)
|
||||
|
||||
@@ -76,7 +76,6 @@ add_library(common
|
||||
)
|
||||
|
||||
target_include_directories(common PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
target_include_directories(common PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
target_link_libraries(common PUBLIC fmt Threads::Threads fast_float)
|
||||
target_link_libraries(common PRIVATE "${CMAKE_DL_LIBS}")
|
||||
|
||||
|
||||
@@ -149,7 +149,7 @@ set(RECOMPILER_SRCS
|
||||
)
|
||||
|
||||
target_precompile_headers(core PRIVATE "pch.h")
|
||||
target_include_directories(core PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
target_include_directories(core PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
target_link_libraries(core PUBLIC Threads::Threads common util)
|
||||
target_link_libraries(core PRIVATE xxhash imgui rapidyaml rcheevos cpuinfo::cpuinfo ZLIB::ZLIB zstd::libzstd_shared libzip::zip speex_resampler_headers)
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ add_executable(duckstation-mini
|
||||
mini_host.cpp
|
||||
)
|
||||
|
||||
target_include_directories(duckstation-mini PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
target_link_libraries(duckstation-mini PRIVATE core util common imgui scmversion SDL3::SDL3)
|
||||
|
||||
add_core_resources(duckstation-mini)
|
||||
|
||||
@@ -181,7 +181,7 @@ set(TS_FILES
|
||||
|
||||
add_executable(duckstation-qt ${SRCS} ${QM_FILES})
|
||||
target_precompile_headers(duckstation-qt PRIVATE "pch.h")
|
||||
target_include_directories(duckstation-qt PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
target_include_directories(duckstation-qt PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
target_link_libraries(duckstation-qt PRIVATE core common imgui minizip scmversion Qt6::Core Qt6::Gui Qt6::GuiPrivate Qt6::Widgets)
|
||||
|
||||
# Our Qt builds may have exceptions on, so force them off.
|
||||
|
||||
@@ -2,6 +2,7 @@ add_executable(duckstation-regtest
|
||||
regtest_host.cpp
|
||||
)
|
||||
|
||||
target_include_directories(duckstation-regtest PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
target_link_libraries(duckstation-regtest PRIVATE core common scmversion)
|
||||
|
||||
add_core_resources(duckstation-regtest)
|
||||
@@ -3,6 +3,7 @@ add_executable(updater
|
||||
updater.h
|
||||
)
|
||||
|
||||
target_include_directories(updater PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
target_link_libraries(updater PRIVATE common minizip ZLIB::ZLIB)
|
||||
|
||||
if(WIN32)
|
||||
|
||||
@@ -5,4 +5,5 @@ add_executable(util-tests
|
||||
image_tests.cpp
|
||||
)
|
||||
|
||||
target_include_directories(util-tests PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
target_link_libraries(util-tests PRIVATE util gtest gtest_main)
|
||||
|
||||
@@ -85,7 +85,6 @@ add_library(util
|
||||
|
||||
target_precompile_headers(util PRIVATE "pch.h")
|
||||
target_include_directories(util PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
target_include_directories(util PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..")
|
||||
target_link_libraries(util PUBLIC common simpleini imgui)
|
||||
target_link_libraries(util PRIVATE libchdr lzma JPEG::JPEG PNG::PNG WebP::libwebp plutosvg::plutosvg ZLIB::ZLIB SoundTouch::SoundTouchDLL xxhash zstd::libzstd_shared reshadefx)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user