diff options
| author | Dave Beckett <dave@dajobe.org> | 2016-11-14 08:56:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-14 08:56:46 -0800 |
| commit | ae17ad6b8715394424149b16856c3df11b9533ee (patch) | |
| tree | d33487b8e44e154eac548057d19e8976b492d462 | |
| parent | 431fca3d5bc2fb0123ea1b5b9831d298526c7459 (diff) | |
| parent | 21e5ff87e94ffb9adb029383ba62fd07cfcc73a3 (diff) | |
| download | raptor-ae17ad6b8715394424149b16856c3df11b9533ee.tar.gz | |
Merge pull request #36 from ariadnext/cmake-GNUInstallDirs
cmake: use GNUInstallDirs for install paths
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | utils/CMakeLists.txt | 4 |
3 files changed, 12 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6aac9124..802afbf3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,8 @@ PROJECT(Raptor2 C) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7) +INCLUDE( GNUInstallDirs ) + SET(CMAKE_INCLUDE_CURRENT_DIR 1) ################################################################ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c6f75055..7d0d4b21 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -378,8 +378,8 @@ ENDIF(RAPTOR_PARSER_RDFXML) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/raptor2.pc "prefix=${CMAKE_INSTALL_PREFIX} exec_prefix=\${prefix} -libdir=\${exec_prefix}/lib -includedir=\${prefix}/include/raptor2 +libdir=\${exec_prefix}/${CMAKE_INSTALL_LIBDIR} +includedir=\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}/raptor2 Name: Raptor RDF Parsing Library Description: RDF Parser Toolkit Library @@ -392,22 +392,22 @@ Cflags: -I\${includedir} INSTALL(FILES raptor.h ${CMAKE_CURRENT_BINARY_DIR}/raptor2.h - DESTINATION include/raptor2 + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/raptor2 ) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/raptor2.pc - DESTINATION lib/pkgconfig + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) INSTALL( TARGETS raptor2 EXPORT Raptor2Config - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) -INSTALL(EXPORT Raptor2Config DESTINATION lib/cmake) +INSTALL(EXPORT Raptor2Config DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) # end raptor/src/CMakeLists.txt diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 3c76e1b5..31c0dd1e 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -20,7 +20,7 @@ TARGET_LINK_LIBRARIES(rapper raptor2) ADD_EXECUTABLE(rdfdiff rdfdiff.c ${getopt_sources}) TARGET_LINK_LIBRARIES(rdfdiff raptor2) -INSTALL(FILES rapper.1 DESTINATION share/man/man1) -INSTALL(TARGETS rapper DESTINATION bin) +INSTALL(FILES rapper.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) +INSTALL(TARGETS rapper DESTINATION ${CMAKE_INSTALL_BINDIR}) # end raptor/utils/CMakeLists.txt |