From a622b7391d4a715ad00d96dfbd3a06938d6fcdac Mon Sep 17 00:00:00 2001 From: Tobias Hienzsch Date: Sat, 11 May 2024 05:01:49 +0200 Subject: [PATCH] Fix cmake utility target names --- cmake/CodeCoverage.cmake | 10 +++++----- cmake/CompilerOptions.cmake | 22 +++++++++++----------- cmake/CompilerWarnings.cmake | 12 ++++++------ src/CMakeLists.txt | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cmake/CodeCoverage.cmake b/cmake/CodeCoverage.cmake index ebde4d4..befcf43 100644 --- a/cmake/CodeCoverage.cmake +++ b/cmake/CodeCoverage.cmake @@ -1,9 +1,9 @@ # Code Coverage Configuration -add_library(mc_coverage INTERFACE) -add_library(ra::coverage ALIAS mc_coverage) +add_library(ra_coverage INTERFACE) +add_library(ra::coverage ALIAS ra_coverage) if(MC_BUILD_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - target_compile_options(mc_coverage INTERFACE -O0 -g --coverage) - target_link_libraries(mc_coverage INTERFACE --coverage) - target_link_options(mc_coverage INTERFACE --coverage) + target_compile_options(ra_coverage INTERFACE -O0 -g --coverage) + target_link_libraries(ra_coverage INTERFACE --coverage) + target_link_options(ra_coverage INTERFACE --coverage) endif() diff --git a/cmake/CompilerOptions.cmake b/cmake/CompilerOptions.cmake index 3b69613..1f9b6ef 100644 --- a/cmake/CompilerOptions.cmake +++ b/cmake/CompilerOptions.cmake @@ -1,26 +1,26 @@ -add_library(mc_compiler_options INTERFACE) -add_library(ra::compiler_options ALIAS mc_compiler_options) +add_library(ra_compiler_options INTERFACE) +add_library(ra::compiler_options ALIAS ra_compiler_options) if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - target_compile_options(mc_compiler_options INTERFACE "/permissive-") + target_compile_options(ra_compiler_options INTERFACE "/permissive-") endif() if(MC_BUILD_ASAN AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - target_compile_options(mc_compiler_options INTERFACE -fsanitize=address -fsanitize-address-use-after-scope -O1 -g -fno-omit-frame-pointer) - target_link_libraries(mc_compiler_options INTERFACE -fsanitize=address -fsanitize-address-use-after-scope -O1 -g -fno-omit-frame-pointer) + target_compile_options(ra_compiler_options INTERFACE -fsanitize=address -fsanitize-address-use-after-scope -O1 -g -fno-omit-frame-pointer) + target_link_libraries(ra_compiler_options INTERFACE -fsanitize=address -fsanitize-address-use-after-scope -O1 -g -fno-omit-frame-pointer) endif() if(MC_BUILD_UBSAN AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - target_compile_options(mc_compiler_options INTERFACE -fsanitize=undefined -O1 -g -fno-omit-frame-pointer) - target_link_libraries(mc_compiler_options INTERFACE -fsanitize=undefined -O1 -g -fno-omit-frame-pointer) + target_compile_options(ra_compiler_options INTERFACE -fsanitize=undefined -O1 -g -fno-omit-frame-pointer) + target_link_libraries(ra_compiler_options INTERFACE -fsanitize=undefined -O1 -g -fno-omit-frame-pointer) endif() if(MC_BUILD_MSAN AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - target_compile_options(mc_compiler_options INTERFACE -fsanitize=memory -O1 -g -fno-omit-frame-pointer) - target_link_libraries(mc_compiler_options INTERFACE -fsanitize=memory -O1 -g -fno-omit-frame-pointer) + target_compile_options(ra_compiler_options INTERFACE -fsanitize=memory -O1 -g -fno-omit-frame-pointer) + target_link_libraries(ra_compiler_options INTERFACE -fsanitize=memory -O1 -g -fno-omit-frame-pointer) endif() if(MC_BUILD_TSAN AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - target_compile_options(mc_compiler_options INTERFACE -fsanitize=thread -O1 -g -fno-omit-frame-pointer) - target_link_libraries(mc_compiler_options INTERFACE -fsanitize=thread -O1 -g -fno-omit-frame-pointer) + target_compile_options(ra_compiler_options INTERFACE -fsanitize=thread -O1 -g -fno-omit-frame-pointer) + target_link_libraries(ra_compiler_options INTERFACE -fsanitize=thread -O1 -g -fno-omit-frame-pointer) endif() diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake index 8a03448..55a88b0 100644 --- a/cmake/CompilerWarnings.cmake +++ b/cmake/CompilerWarnings.cmake @@ -1,13 +1,13 @@ -add_library(mc_compiler_warnings INTERFACE) -add_library(ra::compiler_warnings ALIAS mc_compiler_warnings) +add_library(ra_compiler_warnings INTERFACE) +add_library(ra::compiler_warnings ALIAS ra_compiler_warnings) if((CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") OR (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")) - target_compile_options(mc_compiler_warnings INTERFACE /W3) + target_compile_options(ra_compiler_warnings INTERFACE /W3) if (MC_BUILD_WERROR) - target_compile_options(mc_compiler_warnings INTERFACE /WX) + target_compile_options(ra_compiler_warnings INTERFACE /WX) endif (MC_BUILD_WERROR) else () - target_compile_options(mc_compiler_warnings + target_compile_options(ra_compiler_warnings INTERFACE -Wall -Wcast-align @@ -51,6 +51,6 @@ else () > ) if (MC_BUILD_WERROR) - target_compile_options(mc_compiler_warnings INTERFACE -Werror) + target_compile_options(ra_compiler_warnings INTERFACE -Werror) endif (MC_BUILD_WERROR) endif () diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d95af1d..6feb956 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,8 +1,8 @@ -project(mc_acoustics) +project(ra_acoustics) find_package(mp-units REQUIRED) -add_library(${PROJECT_NAME} STATIC) +add_library(ra_acoustics STATIC) add_library(ra::acoustics ALIAS ${PROJECT_NAME}) target_include_directories(${PROJECT_NAME} PUBLIC