Skip to content

Commit cfd4a4a

Browse files
committed
Merge branch 'lib64' into 'v80-bugfix'
Replace hardcoded usage of lib, bin and include by cmake environment variables See merge request integer/scip!3105
2 parents bf963dc + 3f0f1e6 commit cfd4a4a

File tree

1 file changed

+20
-18
lines changed

1 file changed

+20
-18
lines changed

src/CMakeLists.txt

+20-18
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#
22
# interface function for setting common library properties
33
#
4+
include(GNUInstallDirs)
5+
46
function(setLibProperties targetname outputname)
57
set_target_properties(${targetname} PROPERTIES
68
OUTPUT_NAME ${outputname}
7-
MACOSX_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
9+
MACOSX_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
810
endfunction(setLibProperties)
911

1012
set(CMAKE_C_STANDARD 99)
@@ -1096,27 +1098,27 @@ target_include_directories(scip PUBLIC
10961098

10971099
# set the install rpath to the installed destination
10981100
set_target_properties(scip PROPERTIES
1099-
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib"
1101+
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
11001102
INSTALL_RPATH_USE_LINK_PATH TRUE)
11011103

11021104
# install the header files of scip
1103-
install(FILES ${lpiheaders} DESTINATION include/lpi)
1104-
install(FILES ${dijkstraheaders} DESTINATION include/dijkstra)
1105-
install(FILES ${objscipheaders} DESTINATION include/objscip)
1106-
install(FILES ${scipheaders} ${PROJECT_BINARY_DIR}/scip/config.h ${PROJECT_BINARY_DIR}/scip/scip_export.h DESTINATION include/scip)
1107-
install(FILES ${tcliqueheaders} DESTINATION include/tclique)
1108-
install(FILES ${tinycthreadheader} DESTINATION include/tinycthread)
1109-
install(FILES ${tpiheaders} DESTINATION include/tpi)
1110-
install(FILES ${xmlheaders} DESTINATION include/xml)
1111-
install(FILES ${symheaders} DESTINATION include/symmetry)
1112-
install(FILES ${blockmemshellheader} DESTINATION include/blockmemshell)
1105+
install(FILES ${lpiheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lpi)
1106+
install(FILES ${dijkstraheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dijkstra)
1107+
install(FILES ${objscipheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/objscip)
1108+
install(FILES ${scipheaders} ${PROJECT_BINARY_DIR}/scip/config.h ${PROJECT_BINARY_DIR}/scip/scip_export.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/scip)
1109+
install(FILES ${tcliqueheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tclique)
1110+
install(FILES ${tinycthreadheader} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tinycthread)
1111+
install(FILES ${tpiheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tpi)
1112+
install(FILES ${xmlheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xml)
1113+
install(FILES ${symheaders} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/symmetry)
1114+
install(FILES ${blockmemshellheader} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/blockmemshell)
11131115

11141116
# install the binary and the library to appropriate locations and add them to an export group
11151117
install(TARGETS scip libscip EXPORT scip-targets
1116-
LIBRARY DESTINATION lib
1117-
ARCHIVE DESTINATION lib
1118-
RUNTIME DESTINATION bin
1119-
INCLUDES DESTINATION include)
1118+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
1119+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
1120+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
1121+
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
11201122

11211123
# Add all targets to the build-tree export set
11221124
export(TARGETS scip libscip ${BLISS_TARGET}
@@ -1156,7 +1158,7 @@ configure_file(${PROJECT_SOURCE_DIR}/scip-config.cmake.in
11561158

11571159
# install the targets of the scip export group and the config file so that other projects
11581160
# can link easily against scip
1159-
install(EXPORT scip-targets DESTINATION lib/cmake/scip)
1161+
install(EXPORT scip-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scip)
11601162
install(FILES "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/scip-config.cmake"
11611163
${PROJECT_BINARY_DIR}/scip-config-version.cmake
1162-
DESTINATION lib/cmake/scip)
1164+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scip)

0 commit comments

Comments
 (0)