roland/xo-umbrella2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refcnt: build: use new xo-make macros

Browse source
This commit is contained in:
Roland Conybeare 2023-09-27 13:21:27 -04:00
commit 6c56ed4aec
3 changed files with 38 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

64
CMakeLists.txt
View file

@ -53,41 +53,45 @@ add_subdirectory(utest)
# ----------------------------------------------------------------
# cmake export
set(XO_PROJECT_CONFIG_VERSION "${XO_PROJECT_NAME}ConfigVersion.cmake")
set(XO_PROJECT_CONFIG "${XO_PROJECT_NAME}Config.cmake")
xo_export_cmake_config(${PROJECT_NAME} ${PROJECT_VERSION} ${PROJECT_NAME}Targets)
include(CMakePackageConfigHelpers)
write_basic_package_version_file("${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG_VERSION}"
VERSION 0.1
COMPATIBILITY AnyNewerVersion
)
#install(
# TARGETS ${XO_PROJECT_NAME}
# EXPORT ${XO_PROJECT_NAME}Targets
# LIBRARY DESTINATION lib COMPONENT Runtime
# ARCHIVE DESTINATION lib COMPONENT Development
# RUNTIME DESTINATION bin COMPONENT Runtime
# PUBLIC_HEADER DESTINATION include COMPONENT Development
# BUNDLE DESTINATION bin COMPONENT Runtime
#set(XO_PROJECT_CONFIG_VERSION "${XO_PROJECT_NAME}ConfigVersion.cmake")
#set(XO_PROJECT_CONFIG "${XO_PROJECT_NAME}Config.cmake")
#
#include(CMakePackageConfigHelpers)
#write_basic_package_version_file("${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG_VERSION}"
# VERSION 0.1
# COMPATIBILITY AnyNewerVersion
#)
#
##install(
## TARGETS ${XO_PROJECT_NAME}
## EXPORT ${XO_PROJECT_NAME}Targets
## LIBRARY DESTINATION lib COMPONENT Runtime
## ARCHIVE DESTINATION lib COMPONENT Development
## RUNTIME DESTINATION bin COMPONENT Runtime
## PUBLIC_HEADER DESTINATION include COMPONENT Development
## BUNDLE DESTINATION bin COMPONENT Runtime
## )
#
#configure_package_config_file(
# "${PROJECT_SOURCE_DIR}/cmake/${XO_PROJECT_NAME}Config.cmake.in"
# "${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG}"
# INSTALL_DESTINATION lib/cmake/${XO_PROJECT_NAME}
# )
configure_package_config_file(
"${PROJECT_SOURCE_DIR}/cmake/${XO_PROJECT_NAME}Config.cmake.in"
"${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG}"
INSTALL_DESTINATION lib/cmake/${XO_PROJECT_NAME}
)
install(EXPORT ${XO_PROJECT_NAME}Targets DESTINATION lib/cmake/${XO_PROJECT_NAME})
install(
FILES
"${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG_VERSION}"
"${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG}"
DESTINATION lib/cmake/${XO_PROJECT_NAME})
#
#install(EXPORT ${XO_PROJECT_NAME}Targets DESTINATION lib/cmake/${XO_PROJECT_NAME})
#install(
# FILES
# "${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG_VERSION}"
# "${PROJECT_BINARY_DIR}/${XO_PROJECT_CONFIG}"
# DESTINATION lib/cmake/${XO_PROJECT_NAME})
# ----------------------------------------------------------------
# install .hpp
install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include)
xo_install_include_tree()
#install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include)
# end CMakeLists.txt

2
cmake/refcntConfig.cmake.in
View file

@ -1,4 +1,4 @@
@PACKAGE_INIT@
include("${CMAKE_CURRENT_LIST_DIR}/@XO_PROJECT_NAME@Targets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
check_required_components("@PROJECT_NAME@")

5
src/CMakeLists.txt
View file

@ -7,8 +7,9 @@ set_target_properties(${SELF_LIBRARY_NAME}
VERSION ${PROJECT_VERSION}
SOVERSION 1)
xo_indentlog_dependency(${SELF_LIBRARY_NAME})
xo_internal_dependency(${SELF_LIBRARY_NAME} indentlog)
#xo_indentlog_dependency(${SELF_LIBRARY_NAME})
xo_include_options(${SELF_LIBRARY_NAME})
xo_include_options2(${SELF_LIBRARY_NAME})
xo_compile_options(${SELF_LIBRARY_NAME})
xo_install_library(${SELF_LIBRARY_NAME})