From b3625d09de839abe23ebdedc0630dc3a2a40c93b Mon Sep 17 00:00:00 2001 From: Alexander Lopez Date: Sun, 4 Aug 2024 20:38:47 -0700 Subject: [PATCH] avoid commenting out cmake lines --- cmake/Installing.cmake | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/cmake/Installing.cmake b/cmake/Installing.cmake index 2198868..6655b13 100644 --- a/cmake/Installing.cmake +++ b/cmake/Installing.cmake @@ -6,15 +6,14 @@ set(INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE STRING "Path to ${PROJECT_NAME} CMake files" ) +# Default destinations from GNUInstallDirs are only changed for debug config. if (CMAKE_BUILD_TYPE STREQUAL "Debug") install(TARGETS ${PROJECT_NAME} EXPORT "${PROJECT_NAME}Targets" FILE_SET public_headers - # these get default values from GNUInstallDirs, no need to set them - #RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} # bin + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/debug/bin # bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/debug # lib/debug ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/debug # lib/debug - # except for public headers, as we want them to be inside a library folder PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} # include/str_view INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} # include ) @@ -22,12 +21,8 @@ else() install(TARGETS ${PROJECT_NAME} EXPORT "${PROJECT_NAME}Targets" FILE_SET public_headers - # these get default values from GNUInstallDirs, no need to set them - #RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} # bin - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} # lib - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} # lib - # except for public headers, as we want them to be inside a library folder - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} # include/str_view + # All destinations are default in release except header location. + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} # include/str_view/ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} # include ) endif()