From e6454f059ff1764cc1e4dcd109f800e390c2554b Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Mon, 5 Feb 2024 21:37:59 +0100 Subject: [PATCH] Install runtime files in CMAKE_INSTALL_BINDIR when GNUstep is not installed --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a26f3c0b..3000da5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -307,12 +307,17 @@ set(GNUSTEP_INSTALL_TYPE ${DEFAULT_INSTALL_TYPE} CACHE STRING if (${GNUSTEP_INSTALL_TYPE} STREQUAL "NONE") SET(LIB_INSTALL_PATH "${CMAKE_INSTALL_LIBDIR}" CACHE STRING "Subdirectory of the root prefix where libraries are installed.") + SET(BIN_INSTALL_PATH "${CMAKE_INSTALL_BINDIR}" CACHE STRING + "Subdirectory of the root prefix where libraries are installed.") SET(HEADER_INSTALL_PATH "include") SET(PC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) else () EXEC_PROGRAM(gnustep-config ARGS "--variable=GNUSTEP_${GNUSTEP_INSTALL_TYPE}_LIBRARIES" OUTPUT_VARIABLE LIB_INSTALL_PATH) + EXEC_PROGRAM(gnustep-config + ARGS "--variable=GNUSTEP_${GNUSTEP_INSTALL_TYPE}_LIBRARIES" + OUTPUT_VARIABLE BIN_INSTALL_PATH) EXEC_PROGRAM(gnustep-config ARGS "--variable=GNUSTEP_${GNUSTEP_INSTALL_TYPE}_HEADERS" OUTPUT_VARIABLE HEADER_INSTALL_PATH) @@ -321,7 +326,7 @@ endif () message(STATUS "GNUstep install type set to ${GNUSTEP_INSTALL_TYPE}") install(TARGETS ${INSTALL_TARGETS} - RUNTIME DESTINATION ${LIB_INSTALL_PATH} + RUNTIME DESTINATION ${BIN_INSTALL_PATH} LIBRARY DESTINATION ${LIB_INSTALL_PATH} ARCHIVE DESTINATION ${LIB_INSTALL_PATH}) install(FILES ${libobjc_HDRS}