From 20fcc2941c8f07b6aa50210b3cf8a3ef74f1e1d1 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Fri, 4 Jul 2025 13:37:59 +0200 Subject: [PATCH 1/3] Adjust install path on apple --- CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d145f2c..9916fbe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,6 +159,13 @@ if(MV_UNITY_BUILD) set_target_properties(${PROJECT} PROPERTIES UNITY_BUILD ON) endif() +if(APPLE) + set_target_properties(${PROJECT} PROPERTIES + INSTALL_RPATH "@executable_path/../Frameworks" + INSTALL_RPATH_USE_LINK_PATH TRUE + ) +endif() + # ----------------------------------------------------------------------------- # Target library linking # ----------------------------------------------------------------------------- From acb1fbd37cb79431c957528a288f2712f70bcd86 Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Thu, 10 Jul 2025 15:13:47 +0200 Subject: [PATCH 2/3] Remove extra parenthesis --- cmake/FindFreeImage.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/FindFreeImage.cmake b/cmake/FindFreeImage.cmake index 0f66ab2..8a997b2 100644 --- a/cmake/FindFreeImage.cmake +++ b/cmake/FindFreeImage.cmake @@ -26,14 +26,14 @@ else() NAMES FreeImage.h PATHS - ${FREEIMAGE_CHECK_INCLUDE_DIRS}) + ${FREEIMAGE_CHECK_INCLUDE_DIRS} ) find_library(FreeImage_LIBRARIES NAMES freeimage PATHS - ${FREEIMAGE_CHECK_LIBRARY_DIRS}) + ${FREEIMAGE_CHECK_LIBRARY_DIRS} ) if(FREEIMAGE_INCLUDE_DIRS AND FREEIMAGE_LIBRARIES) From 78c8e70031559510ab0778a967121c490c42715e Mon Sep 17 00:00:00 2001 From: Alexander Vieth Date: Thu, 10 Jul 2025 15:14:21 +0200 Subject: [PATCH 3/3] Fix variable capitelization and imported library --- cmake/FindFreeImage.cmake | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/FindFreeImage.cmake b/cmake/FindFreeImage.cmake index 8a997b2..6a45b58 100644 --- a/cmake/FindFreeImage.cmake +++ b/cmake/FindFreeImage.cmake @@ -36,18 +36,18 @@ else() ${FREEIMAGE_CHECK_LIBRARY_DIRS} ) - if(FREEIMAGE_INCLUDE_DIRS AND FREEIMAGE_LIBRARIES) + if(FreeImage_INCLUDE_DIRS AND FreeImage_LIBRARIES) set(FREEIMAGE_FOUND TRUE) - add_library(FreeImage INTERFACE IMPORTED) - target_include_directories( - FreeImage INTERFACE ${FREEIMAGE_INCLUDE_DIRS}) - target_link_libraries( - FreeImage INTERFACE ${FREEIMAGE_LIBRARIES}) + add_library(FreeImage SHARED IMPORTED) + set_target_properties(FreeImage PROPERTIES + IMPORTED_LOCATION "${FreeImage_LIBRARIES}" + INTERFACE_INCLUDE_DIRECTORIES "${FreeImage_INCLUDE_DIRS}" + ) message(STATUS "Found FreeImage") - message(STATUS " Includes : ${FREEIMAGE_INCLUDE_DIRS}") - message(STATUS " Libraries : ${FREEIMAGE_LIBRARIES}") + message(STATUS " Includes : ${FreeImage_INCLUDE_DIRS}") + message(STATUS " Libraries : ${FreeImage_LIBRARIES}") else() message(FATAL_ERROR "Could not find FreeImage") endif()