From 9cbc933472b93a795e9fb0424e365823363bb72b Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 16 May 2024 09:32:48 +0200
Subject: [PATCH] No longer use CMAKE_BUILD_TYPE to allow configuration choice
at build time.
---
CMakeLists.txt | 2 --
src/CMakeLists.txt | 11 +++++------
tester/CMakeLists.txt | 6 ------
3 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 555b54f..a20ed12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,8 +53,6 @@ endif()
# call include_directories here (see below)
find_package(BCToolbox 5.3.0 REQUIRED OPTIONAL_COMPONENTS tester)
-set(LINK_FLAGS )
-
if(UNIX AND NOT APPLE)
include(CheckIncludeFiles)
check_include_files(libudev.h HAVE_LIBUDEV_H)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1b3f4bf..8a2551f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -58,12 +58,11 @@ if(BUILD_SHARED_LIBS)
)
endif()
if(MSVC)
- if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
- install(FILES $<TARGET_PDB_FILE:belr>
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- )
- endif()
+ install(FILES $<TARGET_PDB_FILE:belr>
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+ CONFIGURATIONS Debug RelWithDebInfo
+ )
endif()
endif()
diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
index 7e692f2..02bc36b 100644
--- a/tester/CMakeLists.txt
+++ b/tester/CMakeLists.txt
@@ -39,8 +39,6 @@ set(SOURCE_FILES_CXX
parser.cpp
)
-string(REPLACE ";" " " LINK_FLAGS_STR "${LINK_FLAGS}")
-
bc_apply_compile_flags(SOURCE_FILES_CXX STRICT_OPTIONS_CPP STRICT_OPTIONS_CXX)
add_executable(belr-tester ${SOURCE_FILES_CXX} ${HEADER_FILES_CXX})
@@ -48,10 +46,6 @@ set_target_properties(belr-tester PROPERTIES LINKER_LANGUAGE CXX)
target_include_directories(belr-tester PUBLIC ${BCTOOLBOX_INCLUDE_DIRS})
target_link_libraries(belr-tester PRIVATE belr ${BCToolbox_tester_TARGET})
-if(NOT "${LINK_FLAGS_STR}" STREQUAL "")
- set_target_properties(belle_sip_tester PROPERTIES LINK_FLAGS "${LINK_FLAGS_STR}")
-endif()
-
if(NOT IOS)
install(TARGETS belr-tester
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--
GitLab