| --- a/CMakeLists.txt |
| +++ b/CMakeLists.txt |
| @@ -10,6 +10,8 @@ |
| string(TOUPPER ${PROJECT_C_NAME} PROJECT_NAME_UPPER) |
| string(TOLOWER ${PROJECT_C_NAME} PROJECT_NAME_LOWER) |
| |
| +include(GNUInstallDirs) |
| + |
| # Common cmake setup |
| if (NOT CMAKE_BUILD_TYPE) |
| message(STATUS "Defaulting to a release build.") |
| @@ -42,7 +44,7 @@ |
| set(BOOST_COMPONENTS regex) |
| endif() |
| |
| -list(APPEND BOOST_COMPONENTS thread date_time chrono system program_options) |
| +list(APPEND BOOST_COMPONENTS thread date_time chrono filesystem system program_options) |
| |
| # Add other dependencies |
| find_package(Boost 1.54 REQUIRED COMPONENTS ${BOOST_COMPONENTS}) |
| --- a/lib/CMakeLists.txt |
| +++ b/lib/CMakeLists.txt |
| @@ -77,7 +77,10 @@ |
| set_target_properties(libprojectsrc PROPERTIES POSITION_INDEPENDENT_CODE true) |
| |
| add_library(lib${PROJECT_NAME} $<TARGET_OBJECTS:libprojectsrc>) |
| -set_target_properties(lib${PROJECT_NAME} PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") |
| +set_target_properties( |
| + lib${PROJECT_NAME} |
| + PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}" |
| + OUTPUT_NAME ${PROJECT_NAME}) |
| target_link_libraries(lib${PROJECT_NAME} |
| ${LEATHERMAN_LIBRARIES} |
| ${Boost_LIBRARIES} |
| @@ -88,7 +91,11 @@ |
| symbol_exports(lib${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}/inc/hocon/export.h") |
| |
| # This correctly handles DLL installation on Windows. |
| -leatherman_install(lib${PROJECT_NAME}) |
| -install(DIRECTORY inc/hocon DESTINATION include) |
| +install( |
| + TARGETS lib${PROJECT_NAME} |
| + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
| + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) |
| +install(DIRECTORY inc/hocon DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) |
| |
| add_subdirectory(tests) |
