diff --git a/cmake/sdk/CMakeLists.txt b/cmake/sdk/CMakeLists.txt index 8db61b4d2..2645ca1e3 100644 --- a/cmake/sdk/CMakeLists.txt +++ b/cmake/sdk/CMakeLists.txt @@ -20,7 +20,7 @@ add_subdirectory(lib/third_party/imgui) add_subdirectory_if_exists(lib/third_party/fmt) add_subdirectory_if_exists(lib/third_party/nlohmann_json) -set(FMT_LIBRARIES fmt::fmt-header-only) +set(FMT_LIBRARIES fmt::fmt-header-only PARENT_SCOPE) add_subdirectory(lib/external/libwolv) diff --git a/lib/libimhex/CMakeLists.txt b/lib/libimhex/CMakeLists.txt index 7f45e0716..e8f9af7d0 100644 --- a/lib/libimhex/CMakeLists.txt +++ b/lib/libimhex/CMakeLists.txt @@ -74,9 +74,9 @@ else() endif() set(LIBIMHEX_LIBRARY_TYPE PUBLIC) + target_compile_definitions(libimhex PRIVATE IMHEX_PROJECT_NAME="${PROJECT_NAME}") endif() -target_compile_definitions(libimhex PRIVATE IMHEX_PROJECT_NAME="${PROJECT_NAME}") set_target_properties(libimhex PROPERTIES POSITION_INDEPENDENT_CODE ON) enableUnityBuild(libimhex) setupCompilerFlags(libimhex) @@ -103,7 +103,7 @@ if (NOT IMHEX_EXTERNAL_PLUGIN_BUILD) target_link_libraries(libimhex PUBLIC ${FOUNDATION}) endif () - target_link_libraries(libimhex PRIVATE microtar libpl plcli libpl-gen libwolv ${FMT_LIBRARIES} ${NFD_LIBRARIES} magic dl ${IMGUI_LIBRARIES} ${NLOHMANN_JSON_LIBRARIES} ${MBEDTLS_LIBRARIES} ${JTHREAD_LIBRARIES}) + target_link_libraries(libimhex PRIVATE microtar libpl plcli libpl-gen libwolv ${FMT_LIBRARIES} ${NFD_LIBRARIES} magic dl ${IMGUI_LIBRARIES} ${NLOHMANN_JSON_LIBRARIES} ${MBEDTLS_LIBRARIES} ${LIBBACKTRACE_LIBRARIES} ${JTHREAD_LIBRARIES}) endif() target_link_libraries(libimhex ${LIBIMHEX_LIBRARY_TYPE} ${NLOHMANN_JSON_LIBRARIES} ${IMGUI_LIBRARIES})