...
This commit is contained in:
@@ -48,7 +48,7 @@ if(USE_SPDLOG)
|
|||||||
set(SPDLOG_USE_STD_FORMAT ON CACHE INTERNAL "Use of C++20 std::format")
|
set(SPDLOG_USE_STD_FORMAT ON CACHE INTERNAL "Use of C++20 std::format")
|
||||||
set(SPDLOG_FMT_EXTERNAL OFF CACHE INTERNAL "Turn off external fmt library")
|
set(SPDLOG_FMT_EXTERNAL OFF CACHE INTERNAL "Turn off external fmt library")
|
||||||
|
|
||||||
set(USE_SPDLOG_SYSTEM OFF)
|
set(USE_SPDLOG_SYSTEM ON)
|
||||||
|
|
||||||
find_package(spdlog CONFIG)
|
find_package(spdlog CONFIG)
|
||||||
if(NOT ${spdlog_FOUND})
|
if(NOT ${spdlog_FOUND})
|
||||||
@@ -60,14 +60,18 @@ if(USE_SPDLOG)
|
|||||||
GIT_SHALLOW TRUE
|
GIT_SHALLOW TRUE
|
||||||
GIT_SUBMODULES ""
|
GIT_SUBMODULES ""
|
||||||
GIT_PROGRESS TRUE
|
GIT_PROGRESS TRUE
|
||||||
CMAKE_ARGS
|
# CMAKE_ARGS
|
||||||
"-DSPDLOG_USE_STD_FORMAT=ON -DSPDLOG_FMT_EXTERNAL=OFF"
|
# -DSPDLOG_USE_STD_FORMAT=ON
|
||||||
|
# -DSPDLOG_FMT_EXTERNAL=OFF
|
||||||
OVERRIDE_FIND_PACKAGE
|
OVERRIDE_FIND_PACKAGE
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set(SPDLOG_INSTALL ON CACHE BOOL "Enable spdlog installation" FORCE)
|
||||||
|
FetchContent_MakeAvailable(spdlog)
|
||||||
|
|
||||||
find_package(spdlog REQUIRED CONFIG)
|
find_package(spdlog REQUIRED CONFIG)
|
||||||
|
|
||||||
set(USE_SPDLOG_SYSTEM ON)
|
set(USE_SPDLOG_SYSTEM OFF)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -189,7 +193,6 @@ if(USE_ASIO)
|
|||||||
message(STATUS "ASIO INC PATHS: ${ASIOLIB_INCLUDE_DIRS}")
|
message(STATUS "ASIO INC PATHS: ${ASIOLIB_INCLUDE_DIRS}")
|
||||||
|
|
||||||
set(USE_ASIO_SYSTEM OFF)
|
set(USE_ASIO_SYSTEM OFF)
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@@ -285,14 +288,14 @@ else()
|
|||||||
target_link_libraries(just_stub PUBLIC ${PROJECT_NAME})
|
target_link_libraries(just_stub PUBLIC ${PROJECT_NAME})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
include(GNUInstallDirs)
|
include(GNUInstallDirs)
|
||||||
|
|
||||||
install(TARGETS ${PROJECT_NAME}
|
install(
|
||||||
EXPORT ${PROJECT_NAME}_Targets
|
TARGETS ${PROJECT_NAME}
|
||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
EXPORT ${PROJECT_NAME}_Targets
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||||
|
)
|
||||||
|
|
||||||
include(CMakePackageConfigHelpers)
|
include(CMakePackageConfigHelpers)
|
||||||
write_basic_package_version_file(
|
write_basic_package_version_file(
|
||||||
@@ -319,8 +322,18 @@ configure_package_config_file(
|
|||||||
PATH_VARS MCC_HEADERS_INSTALLDIR
|
PATH_VARS MCC_HEADERS_INSTALLDIR
|
||||||
)
|
)
|
||||||
|
|
||||||
install(EXPORT ${PROJECT_NAME}_Targets FILE ${PROJECT_NAME}Targets.cmake NAMESPACE ${PROJECT_NAME_NAMESPACE}:: DESTINATION ${MCC_CONFIG_INSTALLDIR})
|
install(
|
||||||
install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" DESTINATION ${MCC_CONFIG_INSTALLDIR})
|
EXPORT ${PROJECT_NAME}_Targets
|
||||||
|
FILE ${PROJECT_NAME}Targets.cmake
|
||||||
|
NAMESPACE ${PROJECT_NAME_NAMESPACE}::
|
||||||
|
DESTINATION ${MCC_CONFIG_INSTALLDIR}
|
||||||
|
)
|
||||||
|
install(
|
||||||
|
FILES
|
||||||
|
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
|
||||||
|
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
|
||||||
|
DESTINATION ${MCC_CONFIG_INSTALLDIR}
|
||||||
|
)
|
||||||
install(FILES ${MCC_SRC} DESTINATION include/${PROJECT_NAME})
|
install(FILES ${MCC_SRC} DESTINATION include/${PROJECT_NAME})
|
||||||
|
|
||||||
# uninstall target
|
# uninstall target
|
||||||
|
|||||||
Reference in New Issue
Block a user