Skip to content

Adjust install path on apple, fix FindFreeImage #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alxvth merged 3 commits into from
Jul 10, 2025
Merged

Adjust install path on apple, fix FindFreeImage #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20fcc29
Adjust install path on apple
alxvth Jul 4, 2025
acb1fbd
Remove extra parenthesis
alxvth Jul 10, 2025
78c8e70
Fix variable capitelization and imported library
alxvth Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# -----------------------------------------------------------------------------
Expand Down
20 changes: 10 additions & 10 deletions cmake/FindFreeImage.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,28 @@ 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)
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()
Expand Down