From 24faec2bf631e11691caeddb765462c8a8578418 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 18 Sep 2024 20:54:46 +0000 Subject: [PATCH] build: Use new/robust init_library fn in lib_domain --- src/lib_domain/CMakeLists.txt | 63 ++++------------------------------- 1 file changed, 7 insertions(+), 56 deletions(-) diff --git a/src/lib_domain/CMakeLists.txt b/src/lib_domain/CMakeLists.txt index 059fcc20c..7cd1dff07 100644 --- a/src/lib_domain/CMakeLists.txt +++ b/src/lib_domain/CMakeLists.txt @@ -1,60 +1,11 @@ cmake_minimum_required(VERSION 3.23) project(domain) -include(GNUInstallDirs) -include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake) -include(${CMAKE_SOURCE_DIR}/cmake/ProtobufGenerateCpp.cmake) +include(${CMAKE_SOURCE_DIR}/cmake/InitLibrary.cmake) -# Sources -file( - GLOB_RECURSE ${PROJECT_NAME}_SOURCES - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - *.cpp +init_library(STATIC) +target_link_libraries( + ${PROJECT_NAME} + PUBLIC + system + protobuf ) - -# Proto sources -file( - GLOB_RECURSE ${PROJECT_NAME}_PROTO_SOURCES - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - *.proto -) - -update_deps_file("${${PROJECT_NAME}_PROTO_SOURCES};") - -# Generate proto cpp -message(STATUS "Generating proto cpp") -protobuf_generate_cpp( - CXX_SOURCES ${PROJECT_NAME}_CXX_PROTO_SOURCES - CXX_HEADERS ${PROJECT_NAME}_CXX_PROTO_HEADERS - CXX_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR} - PROTO_INCLUDE_DIRS - ${EXTERNALS_INCLUDE} - ${CMAKE_CURRENT_SOURCE_DIR} - PROTO_SOURCES - ${${PROJECT_NAME}_PROTO_SOURCES} -) - -add_library(${PROJECT_NAME} STATIC ${${PROJECT_NAME}_CXX_PROTO_SOURCES} ${${PROJECT_NAME}_SOURCES}) - -target_include_directories( - ${PROJECT_NAME} PUBLIC - $ - $ - $ -) - -target_link_directories( - ${PROJECT_NAME} PUBLIC - $ - $ -) -target_link_libraries(${PROJECT_NAME} PUBLIC - system - protobuf -) - -foreach(_hdr ${${PROJECT_NAME}_CXX_PROTO_HEADERS}) - file(RELATIVE_PATH _relative_path ${CMAKE_CURRENT_BINARY_DIR} ${_hdr}) - install(FILES ${_hdr} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${_relative_path}) -endforeach() -include(${CMAKE_SOURCE_DIR}/cmake/InstallBasic.cmake) -install_basic()