build: Improvements to bundled libraries support. (#6435)

2023-04-28 13:02:53 -07:00 · 2023-04-28 13:02:53 -07:00 · ea649263b7
commit ea649263b7
parent 30bf654d2f
21 changed files with 255 additions and 114 deletions
--- a/src/android/app/src/main/jni/CMakeLists.txt
+++ b/src/android/app/src/main/jni/CMakeLists.txt
@ -33,7 +33,7 @@ add_library(citra-android SHARED
    ndk_motion.h
 )

-target_link_libraries(citra-android PRIVATE audio_core common core input_common network)
+target_link_libraries(citra-android PRIVATE audio_core citra_common citra_core input_common network)
 target_link_libraries(citra-android PRIVATE android camera2ndk EGL glad inih jnigraphics log mediandk yuv)

 set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} citra-android)
--- a/src/audio_core/CMakeLists.txt
+++ b/src/audio_core/CMakeLists.txt
@ -36,7 +36,7 @@ add_library(audio_core STATIC

 create_target_directory_groups(audio_core)

-target_link_libraries(audio_core PUBLIC common)
+target_link_libraries(audio_core PUBLIC citra_common)
 target_link_libraries(audio_core PRIVATE SoundTouch teakra)
 set_target_properties(audio_core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})
 add_definitions(-DSOUNDTOUCH_INTEGER_SAMPLES)
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@ -18,7 +18,7 @@ add_executable(citra

 create_target_directory_groups(citra)

-target_link_libraries(citra PRIVATE common core input_common network)
+target_link_libraries(citra PRIVATE citra_common citra_core input_common network)
 target_link_libraries(citra PRIVATE inih glad)
 if (MSVC)
    target_link_libraries(citra PRIVATE getopt)
@ -41,3 +41,14 @@ endif()
 if (CITRA_USE_PRECOMPILED_HEADERS)
    target_precompile_headers(citra PRIVATE precompiled_headers.h)
 endif()
+
+if (CITRA_BUNDLE_LIBRARIES)
+    add_custom_command(TARGET citra
+        POST_BUILD
+        COMMAND ${CMAKE_COMMAND}
+        -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+        -DTYPE=standalone
+        -DEXECUTABLE_PATH=$<TARGET_FILE:citra>
+        -P ${CMAKE_SOURCE_DIR}/CMakeModules/BundleLibraries.cmake
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+endif()
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@ -246,13 +246,15 @@ target_sources(citra-qt
 if (APPLE)
    set(MACOSX_ICON "../../dist/citra.icns")
    set_source_files_properties(${MACOSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-    target_sources(citra-qt PRIVATE ${MACOSX_ICON})
-    set_target_properties(citra-qt PROPERTIES MACOSX_BUNDLE TRUE)
-    set_target_properties(citra-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
    target_sources(citra-qt PRIVATE
+        ${MACOSX_ICON}
        macos_authorization.h
        macos_authorization.mm
    )
+    set_target_properties(citra-qt PROPERTIES
+        MACOSX_BUNDLE TRUE
+        MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist
+    )
 elseif(WIN32)
    # compile as a win32 gui application instead of a console application
    target_link_libraries(citra-qt PRIVATE Qt5::WinMain)
@ -263,9 +265,25 @@ elseif(WIN32)
    endif()
 endif()

+if (CITRA_BUNDLE_LIBRARIES)
+    if (APPLE)
+        set(BUNDLE_DIR "$<TARGET_BUNDLE_DIR:citra-qt>")
+    endif()
+
+    add_custom_command(TARGET citra-qt
+        POST_BUILD
+        COMMAND ${CMAKE_COMMAND}
+        -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+        -DTYPE=qt
+        -DEXECUTABLE_PATH=$<TARGET_FILE:citra-qt>
+        -DBUNDLE_PATH=${BUNDLE_DIR}
+        -P ${CMAKE_SOURCE_DIR}/CMakeModules/BundleLibraries.cmake
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+endif()
+
 create_target_directory_groups(citra-qt)

-target_link_libraries(citra-qt PRIVATE audio_core common core input_common network video_core)
+target_link_libraries(citra-qt PRIVATE audio_core citra_common citra_core input_common network video_core)
 target_link_libraries(citra-qt PRIVATE Boost::boost glad nihstro-headers Qt5::Widgets Qt5::Multimedia Qt5::Concurrent)
 target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)

--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@ -42,7 +42,7 @@ add_custom_command(OUTPUT scm_rev.cpp
      "${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake"
 )

-add_library(common STATIC
+add_library(citra_common STATIC
    aarch64/cpu_detect.cpp
    aarch64/cpu_detect.h
    alignment.h
@ -131,16 +131,16 @@ add_library(common STATIC
    zstd_compression.h
 )

-create_target_directory_groups(common)
+create_target_directory_groups(citra_common)

-target_link_libraries(common PUBLIC fmt::fmt microprofile Boost::boost Boost::serialization Boost::iostreams)
-target_link_libraries(common PRIVATE libzstd_static)
-set_target_properties(common PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})
+target_link_libraries(citra_common PUBLIC fmt::fmt microprofile Boost::boost Boost::serialization Boost::iostreams)
+target_link_libraries(citra_common PRIVATE libzstd_static)
+set_target_properties(citra_common PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})

 if ("x86_64" IN_LIST ARCHITECTURE)
-    target_link_libraries(common PRIVATE xbyak)
+    target_link_libraries(citra_common PRIVATE xbyak)
 endif()

 if (CITRA_USE_PRECOMPILED_HEADERS)
-    target_precompile_headers(common PRIVATE precompiled_headers.h)
+    target_precompile_headers(citra_common PRIVATE precompiled_headers.h)
 endif()
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@ -1,4 +1,4 @@
-add_library(core STATIC
+add_library(citra_core STATIC
    3ds.h
    arm/arm_interface.h
    arm/dyncom/arm_dyncom.cpp
@ -471,29 +471,29 @@ add_library(core STATIC
 )

 if (ENABLE_FFMPEG_VIDEO_DUMPER)
-    target_sources(core PRIVATE
+    target_sources(citra_core PRIVATE
        dumping/ffmpeg_backend.cpp
        dumping/ffmpeg_backend.h
    )
 endif()

-create_target_directory_groups(core)
+create_target_directory_groups(citra_core)

-target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core)
-target_link_libraries(core PRIVATE Boost::boost Boost::serialization Boost::iostreams)
-target_link_libraries(core PUBLIC dds-ktx PRIVATE cryptopp fmt::fmt lodepng open_source_archives)
-set_target_properties(core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})
+target_link_libraries(citra_core PUBLIC citra_common PRIVATE audio_core network video_core)
+target_link_libraries(citra_core PRIVATE Boost::boost Boost::serialization Boost::iostreams)
+target_link_libraries(citra_core PUBLIC dds-ktx PRIVATE cryptopp fmt::fmt lodepng open_source_archives)
+set_target_properties(citra_core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})

 if (ENABLE_WEB_SERVICE)
-    target_compile_definitions(core PRIVATE -DENABLE_WEB_SERVICE -DCPPHTTPLIB_OPENSSL_SUPPORT)
-    target_link_libraries(core PRIVATE web_service ${OPENSSL_LIBS} httplib)
+    target_compile_definitions(citra_core PRIVATE -DENABLE_WEB_SERVICE -DCPPHTTPLIB_OPENSSL_SUPPORT)
+    target_link_libraries(citra_core PRIVATE web_service ${OPENSSL_LIBS} httplib)
    if (ANDROID)
-        target_link_libraries(core PRIVATE ifaddrs)
+        target_link_libraries(citra_core PRIVATE ifaddrs)
    endif()
 endif()

 if ("x86_64" IN_LIST ARCHITECTURE OR "arm64" IN_LIST ARCHITECTURE)
-    target_sources(core PRIVATE
+    target_sources(citra_core PRIVATE
        arm/dynarmic/arm_dynarmic.cpp
        arm/dynarmic/arm_dynarmic.h
        arm/dynarmic/arm_dynarmic_cp15.cpp
@ -503,13 +503,13 @@ if ("x86_64" IN_LIST ARCHITECTURE OR "arm64" IN_LIST ARCHITECTURE)
        arm/dynarmic/arm_tick_counts.cpp
        arm/dynarmic/arm_tick_counts.h
    )
-    target_link_libraries(core PRIVATE dynarmic)
+    target_link_libraries(citra_core PRIVATE dynarmic)
 endif()

 if (ENABLE_FFMPEG_VIDEO_DUMPER)
-    target_link_libraries(core PUBLIC FFmpeg::avcodec FFmpeg::avformat FFmpeg::swscale FFmpeg::swresample FFmpeg::avutil)
+    target_link_libraries(citra_core PUBLIC FFmpeg::avcodec FFmpeg::avformat FFmpeg::swscale FFmpeg::swresample FFmpeg::avutil)
 endif()

 if (CITRA_USE_PRECOMPILED_HEADERS)
-    target_precompile_headers(core PRIVATE precompiled_headers.h)
+    target_precompile_headers(citra_core PRIVATE precompiled_headers.h)
 endif()
--- a/src/dedicated_room/CMakeLists.txt
+++ b/src/dedicated_room/CMakeLists.txt
@ -8,7 +8,7 @@ add_executable(citra-room

 create_target_directory_groups(citra-room)

-target_link_libraries(citra-room PRIVATE common network)
+target_link_libraries(citra-room PRIVATE citra_common network)
 if (ENABLE_WEB_SERVICE)
    target_compile_definitions(citra-room PRIVATE -DENABLE_WEB_SERVICE)
    target_link_libraries(citra-room PRIVATE web_service)
--- a/src/input_common/CMakeLists.txt
+++ b/src/input_common/CMakeLists.txt
@ -42,7 +42,7 @@ if(ENABLE_LIBUSB)
 endif()

 create_target_directory_groups(input_common)
-target_link_libraries(input_common PUBLIC core PRIVATE common ${Boost_LIBRARIES})
+target_link_libraries(input_common PUBLIC citra_core PRIVATE citra_common ${Boost_LIBRARIES})
 set_target_properties(input_common PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})

 if (CITRA_USE_PRECOMPILED_HEADERS)
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@ -26,7 +26,7 @@ if (ENABLE_WEB_SERVICE)
    endif()
 endif()

-target_link_libraries(network PRIVATE common enet Boost::serialization)
+target_link_libraries(network PRIVATE citra_common enet Boost::serialization)
 set_target_properties(network PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})

 if (CITRA_USE_PRECOMPILED_HEADERS)
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@ -17,7 +17,7 @@ add_executable(tests

 create_target_directory_groups(tests)

-target_link_libraries(tests PRIVATE common core video_core audio_core)
+target_link_libraries(tests PRIVATE citra_common citra_core video_core audio_core)
 target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} Catch2::Catch2WithMain nihstro-headers Threads::Threads)

 add_test(NAME tests COMMAND tests)
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@ -125,7 +125,7 @@ target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE})

 create_target_directory_groups(video_core)

-target_link_libraries(video_core PUBLIC common core)
+target_link_libraries(video_core PUBLIC citra_common citra_core)
 target_link_libraries(video_core PRIVATE glad json-headers dds-ktx nihstro-headers Boost::serialization)
 set_target_properties(video_core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})

--- a/src/web_service/CMakeLists.txt
+++ b/src/web_service/CMakeLists.txt
@ -17,7 +17,7 @@ add_library(web_service STATIC
 create_target_directory_groups(web_service)

 target_compile_definitions(web_service PRIVATE -DCPPHTTPLIB_OPENSSL_SUPPORT)
-target_link_libraries(web_service PRIVATE common network json-headers httplib cpp-jwt)
+target_link_libraries(web_service PRIVATE citra_common network json-headers httplib cpp-jwt)
 target_link_libraries(web_service PUBLIC ${OPENSSL_LIBS})
 set_target_properties(web_service PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})
 if (ANDROID)