Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-28 01:20:51 +01:00
Code Releases Wiki Activity

build: Fixed circular dependency on the imhex target

Browse Source
This commit is contained in:
WerWolv 2022-02-21 13:46:35 +01:00
parent 57e1f7ee10
commit a9a538cec8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -28,7 +28,7 @@ configurePackingResources()
# Add ImHex sources # Add ImHex sources
add_subdirectory(lib/libimhex) add_subdirectory(lib/libimhex)
add_subdirectory(main) add_subdirectory(main)
add_custom_target(imhex ALL DEPENDS main) add_custom_target(imhex_all ALL DEPENDS main)
# Add unit tests # Add unit tests
add_subdirectory(tests EXCLUDE_FROM_ALL) add_subdirectory(tests EXCLUDE_FROM_ALL)

8
cmake/build_helpers.cmake
View File

@ -175,7 +175,7 @@ macro(createPackage)
endif () endif ()
endif () endif ()
add_dependencies(imhex ${plugin}) add_dependencies(imhex_all ${plugin})
endif () endif ()
endforeach() endforeach()
@ -226,7 +226,7 @@ macro(createPackage)
include(PostprocessBundle) include(PostprocessBundle)
# Fix rpath # Fix rpath
add_custom_command(TARGET imhex POST_BUILD COMMAND ${CMAKE_INSTALL_NAME_TOOL} -add_rpath "@executable_path/../Frameworks/" $<TARGET_FILE:main>) add_custom_command(TARGET imhex_all POST_BUILD COMMAND ${CMAKE_INSTALL_NAME_TOOL} -add_rpath "@executable_path/../Frameworks/" $<TARGET_FILE:main>)
# FIXME: Remove this once we move/integrate the plugins directory. # FIXME: Remove this once we move/integrate the plugins directory.
add_custom_target(build-time-make-plugins-directory ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${bundle_path}/Contents/MacOS/plugins") add_custom_target(build-time-make-plugins-directory ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${bundle_path}/Contents/MacOS/plugins")
@ -235,7 +235,7 @@ macro(createPackage)
install(FILES ${IMHEX_ICON} DESTINATION "${bundle_path}/Contents/Resources") install(FILES ${IMHEX_ICON} DESTINATION "${bundle_path}/Contents/Resources")
# Update library references to make the bundle portable # Update library references to make the bundle portable
postprocess_bundle(imhex main) postprocess_bundle(imhex_all main)
# Enforce DragNDrop packaging. # Enforce DragNDrop packaging.
set(CPACK_GENERATOR "DragNDrop") set(CPACK_GENERATOR "DragNDrop")
@ -278,4 +278,4 @@ macro(detectBadClone)
message(FATAL_ERROR "External dependency ${EXTERNAL_DIR} is empty!\nMake sure to correctly clone ImHex using the --recurse-submodules git option or initialize the submodules manually.") message(FATAL_ERROR "External dependency ${EXTERNAL_DIR} is empty!\nMake sure to correctly clone ImHex using the --recurse-submodules git option or initialize the submodules manually.")
endif() endif()
endforeach () endforeach ()
endmacro() endmacro()