Skip to content

Commit 4a936ad

Browse files
committed
Fix framework install directory when not installing to the system.
1 parent c0ea96a commit 4a936ad

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

cmake/Installation.cmake

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ include(CMakePackageConfigHelpers)
44
# Paths
55
if(LSL_UNIXFOLDERS)
66
include(GNUInstallDirs)
7-
set(CMAKE_INSTALL_FRAMEWORK_DIR Library/Frameworks CACHE PATH "Install directory for frameworks on macOS")
7+
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
8+
set(FRAMEWORK_DIR_DEFAULT Library/Frameworks)
9+
else()
10+
set(FRAMEWORK_DIR_DEFAULT Frameworks)
11+
endif()
12+
set(CMAKE_INSTALL_FRAMEWORK_DIR ${FRAMEWORK_DIR_DEFAULT} CACHE PATH "Install directory for frameworks on macOS")
813
else()
914
set(CMAKE_INSTALL_BINDIR LSL)
1015
set(CMAKE_INSTALL_LIBDIR LSL)
@@ -39,6 +44,7 @@ install(TARGETS ${LSLTargets}
3944
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
4045
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
4146
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
47+
FRAMEWORK DESTINATION ${CMAKE_INSTALL_FRAMEWORK_DIR}
4248
FILE_SET HEADERS DESTINATION ${LSL_INSTALL_INCLUDEDIR}
4349
)
4450

examples/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function(addlslexample name extension)
4242
# However, this is not necessary for the examples, as they are not intended to be relocated.
4343
# if(APPLE)
4444
# set_target_properties(${name} PROPERTIES
45-
# INSTALL_RPATH "@loader_path;@loader_path/../lib"
45+
# INSTALL_RPATH "@loader_path;@loader_path/../lib;@loader_path/../Frameworks"
4646
# )
4747
# elseif(UNIX)
4848
# set_target_properties(${name} PROPERTIES

0 commit comments

Comments
 (0)