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

xo-websock: build: update to use latest xo-cmake macros

Browse source
This commit is contained in:
Roland Conybeare 2024-09-15 11:40:25 -05:00
commit 0ed8a1f435
2 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

20
CMakeLists.txt
View file

@ -3,25 +3,11 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.10)
project(websock VERSION 1.0) project(websock VERSION 1.0)
enable_language(CXX)
# common XO cmake macros (see proj/xo-cmake) include(GNUInstallDirs)
include(cmake/xo-bootstrap-macros.cmake) include(cmake/xo-bootstrap-macros.cmake)
# ---------------------------------------------------------------- xo_cxx_toplevel_options3()
# unit test setup
enable_testing()
# activate code coverage for all executables + libraries (when configured with -DCODE_COVERAGE=ON)
add_code_coverage()
# 1. assuming that /nix/store/ prefixes .hpp files belonging to gcc, catch2 etc.
# we're not interested in code coverage for these sources.
# 2. exclude the utest/ subdir, we don't need coverage on the unit tests themselves;
# rather, want coverage on the code that the unit tests exercise.
#
# NOTE: this seems to work only with the 'ccov-all' target. In particular, doesn't seem to do anything with the 'ccov' target
#
add_code_coverage_all_targets(EXCLUDE /nix/store/* ${PROJECT_SOURCE_DIR}/utest/* ${PROJECT_BINARY_DIR}/local/* ${PROJECT_SOURCE_DIR}/repo/*)
# ---------------------------------------------------------------- # ----------------------------------------------------------------
# c++ settings # c++ settings
@ -31,8 +17,6 @@ set(PROJECT_CXX_FLAGS "")
#set(PROJECT_CXX_FLAGS "-fconcepts-diagnostics-depth=2") #set(PROJECT_CXX_FLAGS "-fconcepts-diagnostics-depth=2")
add_definitions(${PROJECT_CXX_FLAGS}) add_definitions(${PROJECT_CXX_FLAGS})
xo_toplevel_compile_options()
# ---------------------------------------------------------------- # ----------------------------------------------------------------
add_subdirectory(src/websock) add_subdirectory(src/websock)

33
cmake/xo-bootstrap-macros.cmake
View file

@ -1,14 +1,35 @@
if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL "prefix")) # ----------------------------------------------------------------
# default to typical install location for xo-project-macros # for example:
set(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake) # $ PREFIX=/usr/local # for example
# $ cmake -DCMAKE_MODULE_PATH=prefix -DCMAKE_INSTALL_PREFIX=$PREFIX -B .build
#
# will get
# CMAKE_MODULE_PATH
# from xo-cmake-config --cmake-module-path
#
# and expect .cmake macros in
# CMAKE_MODULE_PATH/xo_macros/xo_cxx.cmake
# ----------------------------------------------------------------
find_program(XO_CMAKE_CONFIG_EXECUTABLE NAMES xo-cmake-config REQUIRED)
if ("${XO_CMAKE_CONFIG_EXECUTABLE}" STREQUAL "XO_CMAKE_CONFIG_EXECUTABLE-NOT_FOUND")
message(FATAL "could not find xo-cmake-config executable")
endif() endif()
message(STATUS "XO_CMAKE_CONFIG_EXECUTABLE=${XO_CMAKE_CONFIG_EXECUTABLE}")
if (NOT XO_SUBMODULE_BUILD) if (NOT XO_SUBMODULE_BUILD)
message("-- CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}") if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix))
message("-- CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}") # default to typical install location for xo-project-macros
execute_process(COMMAND ${XO_CMAKE_CONFIG_EXECUTABLE} --cmake-module-path OUTPUT_VARIABLE CMAKE_MODULE_PATH)
message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
endif()
endif() endif()
# needs to have been installed somewhere on CMAKE_MODULE_PATH, # needs to have been installed somewhere on CMAKE_MODULE_PATH,
# (e.g. from xo-cmake with the same value for CMAKE_INSTALL_PREFIX) # (e.g. from xo-cmake with the same value for CMAKE_INSTALL_PREFIX)
# #
include(xo_macros/xo-project-macros) include(xo_macros/xo_cxx)
xo_cxx_bootstrap_message()