Index: CMakeLists.txt =================================================================== diff -u -r6b422c15085ed605d40cb5dd70177e4657a0ca7e -r671a8e959b3e3e05f207d2955e8ff5ad08e08399 --- CMakeLists.txt (.../CMakeLists.txt) (revision 6b422c15085ed605d40cb5dd70177e4657a0ca7e) +++ CMakeLists.txt (.../CMakeLists.txt) (revision 671a8e959b3e3e05f207d2955e8ff5ad08e08399) @@ -7,40 +7,13 @@ include(cmake/Debug.cmake) -option(BUILD_DEBUG "Build debug" OFF) - set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) -# if(CMAKE_CONFIGURATION_TYPES) -# set(CMAKE_CONFIGURATION_TYPES Debug Profile Release) -# set(CMAKE_CONFIGURATION_TYPES -# "${CMAKE_CONFIGURATION_TYPES}" -# CACHE STRING "Reset the configurations to what we need" FORCE) -# endif() - add_compile_options(-Wall -Werror -Wextra) -# set(CMAKE_BINARY_DIR $ENV{DIR_BUILD}/${PROJECT_NAME}) -# message("CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}") -# set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - -# if(NOT CMAKE_BUILD_TYPE) -# message(STATUS "CMAKE_BUILD_TYPE was not defined. Using Debug as a default.") -# message( -# STATUS "Available options are: ${CMAKE_CONFIGURATION_TYPES}") -# set(CMAKE_BUILD_TYPE -# Debug -# CACHE STRING "Set the type of build" FORCE) -# endif() - -# create the bin directory -# file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) - add_subdirectory(lib) add_subdirectory(tools) add_subdirectory(LeahiRt) - -# dump_cmake_variables() Index: LeahiRt/CMakeLists.txt =================================================================== diff -u -rf8c0a0b1c19dc386b2f88484d53db022270690a7 -r671a8e959b3e3e05f207d2955e8ff5ad08e08399 --- LeahiRt/CMakeLists.txt (.../CMakeLists.txt) (revision f8c0a0b1c19dc386b2f88484d53db022270690a7) +++ LeahiRt/CMakeLists.txt (.../CMakeLists.txt) (revision 671a8e959b3e3e05f207d2955e8ff5ad08e08399) @@ -7,7 +7,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_AUTOMOC ON) @@ -32,7 +31,6 @@ set_target_properties(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../bin" - ADDITIONAL_CLEAN_FILES "${CMAKE_CURRENT_SOURCE_DIR}/../bin" ) target_link_libraries(${PROJECT_NAME} PRIVATE Index: lib/Comms/CMakeLists.txt =================================================================== diff -u -rf8c0a0b1c19dc386b2f88484d53db022270690a7 -r671a8e959b3e3e05f207d2955e8ff5ad08e08399 --- lib/Comms/CMakeLists.txt (.../CMakeLists.txt) (revision f8c0a0b1c19dc386b2f88484d53db022270690a7) +++ lib/Comms/CMakeLists.txt (.../CMakeLists.txt) (revision 671a8e959b3e3e05f207d2955e8ff5ad08e08399) @@ -3,7 +3,6 @@ LANGUAGES CXX ) -set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_AUTOMOC ON) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) @@ -56,19 +55,12 @@ LIBRARY DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/lib" COMPONENT dev ) -# set up include-directories -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}") - # Add all targets to the build-tree export set export( TARGETS ${PROJECT_NAME} FILE "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PROJECT_NAME}Targets.cmake" ) -# Export the package for use from the build-tree (this registers the build-tree -# with a global CMake-registry) -export(PACKAGE ${PROJECT_NAME}) - file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/include") set(CONF_INCLUDE_DIRS "\${COMMS_CMAKE_DIR}/${REL_INCLUDE_DIR}") Index: lib/MsgUtils/CMakeLists.txt =================================================================== diff -u -r2c00c6e743844c9a71fa03ce5a5c436ef3836484 -r671a8e959b3e3e05f207d2955e8ff5ad08e08399 --- lib/MsgUtils/CMakeLists.txt (.../CMakeLists.txt) (revision 2c00c6e743844c9a71fa03ce5a5c436ef3836484) +++ lib/MsgUtils/CMakeLists.txt (.../CMakeLists.txt) (revision 671a8e959b3e3e05f207d2955e8ff5ad08e08399) @@ -3,15 +3,14 @@ LANGUAGES CXX ) -set(CMAKE_VERBOSE_MAKEFILE ON) - set(CMAKE_AUTOMOC ON) if(POLICY CMP0167) cmake_policy(SET CMP0167 NEW) endif() -find_package(Protobuf COMPONENTS REQUIRED) +find_package(Protobuf REQUIRED) +find_package(absl REQUIRED) find_package(Python3 REQUIRED COMPONENTS Interpreter) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Network SerialBus) @@ -157,6 +156,9 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${Protobuf_LIBRARIES} + absl::log + absl::log_internal_check_op + absl::log_internal_message Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::SerialBus @@ -178,19 +180,12 @@ LIBRARY DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/lib" COMPONENT dev ) -# set up include-directories -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}") - # Add all targets to the build-tree export set export( TARGETS ${PROJECT_NAME} FILE "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PROJECT_NAME}Targets.cmake" ) -# Export the package for use from the build-tree (this registers the build-tree -# with a global CMake-registry) -export(PACKAGE ${PROJECT_NAME}) - file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/include") set(CONF_INCLUDE_DIRS "\${MSGUTILS_CMAKE_DIR}/${REL_INCLUDE_DIR}") Index: tools/AgentSim/CMakeLists.txt =================================================================== diff -u -rb1bab9e8d105f31bca82799af43ed354a4ab2df0 -r671a8e959b3e3e05f207d2955e8ff5ad08e08399 --- tools/AgentSim/CMakeLists.txt (.../CMakeLists.txt) (revision b1bab9e8d105f31bca82799af43ed354a4ab2df0) +++ tools/AgentSim/CMakeLists.txt (.../CMakeLists.txt) (revision 671a8e959b3e3e05f207d2955e8ff5ad08e08399) @@ -5,6 +5,7 @@ set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) set(CMAKE_AUTOMOC ON) @@ -36,11 +37,8 @@ set_target_properties(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TOOLS_BIN} - ADDITIONAL_CLEAN_FILES ${TOOLS_BIN} ) install(TARGETS ${PROJECT_NAME} - BUNDLE DESTINATION . RUNTIME DESTINATION ${TOOLS_BIN} - LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/lib ) Index: tools/CANDumpPlayer/CMakeLists.txt =================================================================== diff -u -rcfc0df719cb5033078d0cac45ce0f6243810f2e7 -r671a8e959b3e3e05f207d2955e8ff5ad08e08399 --- tools/CANDumpPlayer/CMakeLists.txt (.../CMakeLists.txt) (revision cfc0df719cb5033078d0cac45ce0f6243810f2e7) +++ tools/CANDumpPlayer/CMakeLists.txt (.../CMakeLists.txt) (revision 671a8e959b3e3e05f207d2955e8ff5ad08e08399) @@ -32,12 +32,8 @@ set_target_properties(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TOOLS_BIN} - ADDITIONAL_CLEAN_FILES ${TOOLS_BIN} ) install(TARGETS ${PROJECT_NAME} - BUNDLE DESTINATION . RUNTIME DESTINATION ${TOOLS_BIN} - # RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/lib )