From ea7828fca36aa3033ccfa07add873f799c699e76 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 13 Nov 2015 12:33:27 -0600 Subject: [PATCH 1/2] allow modified install paths and make them consistent between static/shared builds. Long term, consider using: https://cmake.org/cmake/help/v3.0/module/GNUInstallDirs.html issue #295 --- CMakeLists.txt | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b3e0ba2..46e07e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,6 +138,15 @@ if (MSVC) list(APPEND LIBHFILES ${SRCDIR}/sprtf.h) endif () ####################################### + +if (NOT LIB_INSTALL_DIR) + set(LIB_INSTALL_DIR lib${LIB_SUFFIX}) +endif () + +if (NOT BIN_INSTALL_DIR) + set(BIN_INSTALL_DIR bin) +endif () + # Always build the STATIC library set(name tidy-static) add_library ( ${name} STATIC ${CFILES} ${HFILES} ${LIBHFILES} ) @@ -146,9 +155,9 @@ set_target_properties( ${name} PROPERTIES ) list ( APPEND add_LIBS ${name} ) install(TARGETS ${name} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib + RUNTIME DESTINATION ${BIN_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + LIBRARY DESTINATION ${LIB_INSTALL_DIR} ) install( FILES ${HFILES} DESTINATION include ) ######################################## @@ -166,11 +175,11 @@ if (BUILD_SHARED_LIB) set_target_properties( ${name} PROPERTIES COMPILE_FLAGS "-DBUILDING_SHARED_LIB" ) install(TARGETS ${name} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib + RUNTIME DESTINATION ${BIN_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + LIBRARY DESTINATION ${LIB_INSTALL_DIR} ) -endif () +endif () ########################################################## ### main executable - linked with STATIC library From d0abe84cb38c146ac7c2fae0943552c212c5c7d9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 13 Nov 2015 13:19:10 -0600 Subject: [PATCH 2/2] support INCLUDE_INSTALL_DIR too --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 46e07e8..eb22e03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,6 +147,10 @@ if (NOT BIN_INSTALL_DIR) set(BIN_INSTALL_DIR bin) endif () +if (NOT INCLUDE_INSTALL_DIR) + set(INCLUDE_INSTALL_DIR include) +endif () + # Always build the STATIC library set(name tidy-static) add_library ( ${name} STATIC ${CFILES} ${HFILES} ${LIBHFILES} ) @@ -159,7 +163,7 @@ install(TARGETS ${name} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} LIBRARY DESTINATION ${LIB_INSTALL_DIR} ) -install( FILES ${HFILES} DESTINATION include ) +install( FILES ${HFILES} DESTINATION ${INCLUDE_INSTALL_DIR} ) ######################################## # if user option still on if (BUILD_SHARED_LIB)