imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-28 07:47:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Fix installing external plugins

Browse Source
This commit is contained in:
WerWolv
2024-01-04 10:25:29 +01:00
parent eca41cac16
commit cd72ff1f84
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/modules/ImHexPlugin.cmake
View File

@@ -65,10 +65,19 @@ macro(add_imhex_plugin)
add_definitions(-DIMHEX_PLUGIN_${IMHEX_PLUGIN_NAME}_FEATURE_${feature}=0) add_definitions(-DIMHEX_PLUGIN_${IMHEX_PLUGIN_NAME}_FEATURE_${feature}=0)
endforeach() endforeach()
# Fix rpath
if (APPLE)
set_target_properties(${IMHEX_PLUGIN_NAME} PROPERTIES INSTALL_RPATH "@executable_path/../Frameworks")
endif()
# Add the new plugin to the main dependency list so it gets built by default # Add the new plugin to the main dependency list so it gets built by default
if (TARGET imhex_all) if (TARGET imhex_all)
add_dependencies(imhex_all ${IMHEX_PLUGIN_NAME}) add_dependencies(imhex_all ${IMHEX_PLUGIN_NAME})
endif() endif()
if (IMHEX_EXTERNAL_PLUGIN_BUILD)
install(TARGETS ${IMHEX_PLUGIN_NAME} DESTINATION ".")
endif()
endmacro() endmacro()
macro(add_romfs_resource input output) macro(add_romfs_resource input output)

10
cmake/sdk/CMakeLists.txt
View File

@@ -13,18 +13,20 @@ function(add_subdirectory_if_exists folder)
endif() endif()
endfunction() endfunction()
set(IMHEX_EXTERNAL_PLUGIN_BUILD ON) set(IMHEX_EXTERNAL_PLUGIN_BUILD ON PARENT_SCOPE)
add_custom_target(imhex_all) add_custom_target(imhex_all)
add_subdirectory(lib/third_party/imgui) 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_INSTALL OFF CACHE BOOL "" FORCE)
add_subdirectory_if_exists(lib/third_party/fmt)
set(FMT_LIBRARIES fmt::fmt-header-only PARENT_SCOPE) set(FMT_LIBRARIES fmt::fmt-header-only PARENT_SCOPE)
add_subdirectory_if_exists(lib/third_party/nlohmann_json)
add_subdirectory(lib/external/libwolv) add_subdirectory(lib/external/libwolv)
set(LIBPL_BUILD_CLI_AS_EXECUTABLE OFF) set(LIBPL_ENABLE_CLI OFF)
add_subdirectory(lib/external/pattern_language) add_subdirectory(lib/external/pattern_language)
add_subdirectory(lib/libimhex) add_subdirectory(lib/libimhex)

2
lib/external/pattern_language vendored

Submodule lib/external/pattern_language updated: 312dc93bec...78cdc3e7fd