octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Create INTERFACE targets for microprofile and nihstro

This commit is contained in:
Yuri Kunde Schlesner 2017-05-27 22:34:52 -07:00
parent 3b68600f81
commit d736cca848
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -263,8 +263,12 @@ set(DYNARMIC_NO_BUNDLED_FMT ON)
add_subdirectory(externals/dynarmic) add_subdirectory(externals/dynarmic)
add_subdirectory(externals/glad) add_subdirectory(externals/glad)
include_directories(externals/microprofile)
include_directories(externals/nihstro/include) add_library(microprofile INTERFACE)
target_include_directories(microprofile INTERFACE externals/microprofile)
add_library(nihstro-headers INTERFACE)
target_include_directories(nihstro-headers INTERFACE externals/nihstro/include)
if (MSVC) if (MSVC)
add_subdirectory(externals/getopt) add_subdirectory(externals/getopt)

2
src/citra_qt/CMakeLists.txt
View File

@ -92,7 +92,7 @@ else()
add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS}) add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS})
endif() endif()
target_link_libraries(citra-qt PRIVATE audio_core common core input_common video_core) target_link_libraries(citra-qt PRIVATE audio_core common core input_common video_core)
target_link_libraries(citra-qt PRIVATE Boost::boost glad Qt5::OpenGL Qt5::Widgets) target_link_libraries(citra-qt PRIVATE Boost::boost glad nihstro-headers Qt5::OpenGL Qt5::Widgets)
target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)

2
src/common/CMakeLists.txt
View File

@ -95,7 +95,7 @@ endif()
create_directory_groups(${SRCS} ${HEADERS}) create_directory_groups(${SRCS} ${HEADERS})
add_library(common STATIC ${SRCS} ${HEADERS}) add_library(common STATIC ${SRCS} ${HEADERS})
target_link_libraries(common PUBLIC Boost::boost) target_link_libraries(common PUBLIC Boost::boost microprofile)
if (ARCHITECTURE_x86_64) if (ARCHITECTURE_x86_64)
target_link_libraries(common PRIVATE xbyak) target_link_libraries(common PRIVATE xbyak)
endif() endif()

2
src/video_core/CMakeLists.txt
View File

@ -80,7 +80,7 @@ create_directory_groups(${SRCS} ${HEADERS})
add_library(video_core STATIC ${SRCS} ${HEADERS}) add_library(video_core STATIC ${SRCS} ${HEADERS})
target_link_libraries(video_core PUBLIC common core) target_link_libraries(video_core PUBLIC common core)
target_link_libraries(video_core PRIVATE glad) target_link_libraries(video_core PRIVATE glad nihstro-headers)
if (ARCHITECTURE_x86_64) if (ARCHITECTURE_x86_64)
target_link_libraries(video_core PRIVATE xbyak) target_link_libraries(video_core PRIVATE xbyak)