Skip to content

Commit 7e025f2

Browse files
committed
As long as upstream has GNUInstallDirs in use, let's really use it.
1 parent 3b3681b commit 7e025f2

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ ENDIF()
2626
SET(DEBUG_LIBNAME_SUFFIX "" CACHE STRING "Optional suffix to append to the library name for a debug build")
2727
SET(LIB_SUFFIX "" CACHE STRING "Optional arch-dependent suffix for the library installation directory")
2828

29-
SET(RUNTIME_INSTALL_DIR bin
29+
SET(RUNTIME_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}
3030
CACHE PATH "Install dir for executables and dlls")
31-
SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX}
31+
SET(ARCHIVE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}
3232
CACHE PATH "Install dir for static libraries")
33-
SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX}
33+
SET(LIBRARY_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}
3434
CACHE PATH "Install dir for shared libraries")
35-
SET(INCLUDE_INSTALL_DIR include/jsoncpp
35+
SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}/jsoncpp
3636
CACHE PATH "Install dir for headers")
37-
SET(PACKAGE_INSTALL_DIR lib${LIB_SUFFIX}/cmake
37+
SET(PACKAGE_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake
3838
CACHE PATH "Install dir for cmake package config files")
3939
MARK_AS_ADVANCED( RUNTIME_INSTALL_DIR ARCHIVE_INSTALL_DIR INCLUDE_INSTALL_DIR PACKAGE_INSTALL_DIR )
4040

0 commit comments

Comments
 (0)