From a9a538cec87654df9a5c1c32ded3a43ce8c3f62c Mon Sep 17 00:00:00 2001 From: WerWolv Date: Mon, 21 Feb 2022 13:46:35 +0100 Subject: [PATCH] build: Fixed circular dependency on the imhex target --- CMakeLists.txt | 2 +- cmake/build_helpers.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 59087df61..d5b885740 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ configurePackingResources() # Add ImHex sources add_subdirectory(lib/libimhex) add_subdirectory(main) -add_custom_target(imhex ALL DEPENDS main) +add_custom_target(imhex_all ALL DEPENDS main) # Add unit tests add_subdirectory(tests EXCLUDE_FROM_ALL) diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index 759a11ae3..9bb80c2e1 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake @@ -175,7 +175,7 @@ macro(createPackage) endif () endif () - add_dependencies(imhex ${plugin}) + add_dependencies(imhex_all ${plugin}) endif () endforeach() @@ -226,7 +226,7 @@ macro(createPackage) include(PostprocessBundle) # Fix rpath - add_custom_command(TARGET imhex POST_BUILD COMMAND ${CMAKE_INSTALL_NAME_TOOL} -add_rpath "@executable_path/../Frameworks/" $) + add_custom_command(TARGET imhex_all POST_BUILD COMMAND ${CMAKE_INSTALL_NAME_TOOL} -add_rpath "@executable_path/../Frameworks/" $) # 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") @@ -235,7 +235,7 @@ macro(createPackage) install(FILES ${IMHEX_ICON} DESTINATION "${bundle_path}/Contents/Resources") # Update library references to make the bundle portable - postprocess_bundle(imhex main) + postprocess_bundle(imhex_all main) # Enforce DragNDrop packaging. 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.") endif() endforeach () -endmacro() \ No newline at end of file +endmacro()