--- CMakeLists.txt.orig 2021-07-01 08:31:50.000000000 +0800 +++ CMakeLists.txt 2023-01-31 04:33:05.000000000 +0800 @@ -28,7 +28,7 @@ set( SOURCE_DIR "${PROJECT_SOURCE_DIR}/source/corvusoft/${PROJECT_NAME}" ) if ( NOT DEFINED CMAKE_INSTALL_LIBDIR ) - set( CMAKE_INSTALL_LIBDIR "library") + set( CMAKE_INSTALL_LIBDIR "lib") endif ( ) if ( CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT ) @@ -43,7 +43,7 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Weffc++ -pedantic -Wno-unknown-pragmas -Wno-deprecated-declarations -Wno-non-virtual-dtor" ) endif ( ) -if ( UNIX AND NOT APPLE ) +if ( UNIX OR APPLE ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread" ) endif ( ) @@ -118,6 +118,6 @@ file( GLOB ARTIFACTS "${SOURCE_DIR}/*.hpp" ) install( FILES "${INCLUDE_DIR}/${PROJECT_NAME}" DESTINATION "${CMAKE_INSTALL_PREFIX}/include" ) -install( FILES ${ARTIFACTS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/corvusoft/${PROJECT_NAME}" ) +install( FILES ${ARTIFACTS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}" ) install( TARGETS ${STATIC_LIBRARY_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library ) install( TARGETS ${SHARED_LIBRARY_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library )