From 7eabe38ab85d79c71fcfc27c4c495be11713703d Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 27 Sep 2024 16:54:34 +0000
Subject: [PATCH] Fix static build, setting the BELR_STATIC definition
correctly and building...
---
CMakeLists.txt | 10 ----------
src/CMakeLists.txt | 4 ++++
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7acdf3..e644597 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,16 +66,6 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
-set(BELR_CPPFLAGS )
-if(NOT BUILD_SHARED_LIBS)
- list(APPEND BELR_CPPFLAGS "-DBELR_STATIC")
-endif()
-if(BELR_CPPFLAGS)
- list(REMOVE_DUPLICATES BELR_CPPFLAGS)
- add_definitions(${BELR_CPPFLAGS})
-endif()
-add_definitions("-DBELR_EXPORTS")
-
set(BELR_GRAMMARS_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/belr/grammars")
set(BELR_GRAMMARS_RELATIVE_DIR "${CMAKE_INSTALL_DATADIR}/belr/grammars")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8bb8325..65104be 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,6 +47,7 @@ target_compile_definitions(belr PRIVATE "BCTBX_LOG_DOMAIN=\"belr\"")
target_link_libraries(belr PUBLIC ${BCToolbox_TARGET} PRIVATE ${LIBS})
if(BUILD_SHARED_LIBS)
+ target_compile_definitions(belr PRIVATE "BELR_EXPORTS")
if(APPLE)
set_target_properties(belr PROPERTIES
FRAMEWORK TRUE
@@ -62,6 +63,9 @@ if(BUILD_SHARED_LIBS)
CONFIGURATIONS Debug RelWithDebInfo
)
endif()
+else()
+ target_compile_definitions(belr PUBLIC "BELR_STATIC")
+ set_target_properties(belr PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
install(TARGETS belr EXPORT ${PROJECT_NAME}Targets
--
GitLab