Mirrors/openE57
0
0
Fork 0
mirror of https://github.com/openE57/openE57.git synced 2026-01-18 01:11:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cmake build system improvements (#39)

Browse Source 
* get xerces-c library through fetch content if it's not found

* expose library headers

* add xerces-c tag option and update readme
This commit is contained in:
BaoBaB1
2025-02-28 21:21:38 +02:00
committed by GitHub
parent ef7986e6b6
commit 54d4a208e2
4 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -44,6 +44,8 @@ cmake_policy(SET CMP0091 NEW)
project(openE57 VERSION 1.7.0 LANGUAGES C CXX DESCRIPTION "openE57 is a library for handling E57 files")
set(XERCES_C_DEFAULT_FETCH_TAG "v3.3.0" CACHE STRING "Tag that is used for fetching xerces-c library")
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)

1
README.md
View File

@@ -58,6 +58,7 @@ Available CMake Options are:
* BUILD_TOOLS - builds the binary tools to validate and dump E57 files
* BUILD_TESTS - builds tests
* BUILD_SHARED_LIBS - actually unsupported (missing exported symbols)
* XERCES_C_DEFAULT_FETCH_TAG - tag that is used for fetching and building xerces-c library from sources (if it's not found on your system)
* BUILD_WITH_MT - instructs CMake to set the correct [`CMAKE_MSVC_RUNTIME_LIBRARY`](https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html?highlight=cmake_msvc_runtime_library) flag for Visual Studio
Building with Position indipendent code on Unix can be activated with the option [`CMAKE_POSITION_INDEPENDENT_CODE`](https://cmake.org/cmake/help/latest/variable/CMAKE_POSITION_INDEPENDENT_CODE.html?highlight=cmake_position_independent_code).

41
src/cmake/dependencies.cmake
View File

@@ -1,22 +1,37 @@
include(FetchContent)
# Find the Xerces libraries
set(Xerces_USE_STATIC_LIBS ON)
find_package(XercesC 3.2 REQUIRED)
set(XML_LIBRARIES ${XercesC_LIBRARIES})
set(XML_INCLUDE_DIRS ${XercesC_INCLUDE_DIRS})
find_package(XercesC 3.2 QUIET)
if (XercesC_FOUND)
set(XML_LIBRARIES ${XercesC_LIBRARIES})
set(XML_INCLUDE_DIRS ${XercesC_INCLUDE_DIRS})
# Add ICU in Linux Systems
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Apple")
find_package(ICU REQUIRED)
set(XML_LIBRARIES ${XML_LIBRARIES} ${ICU_LIBRARIES})
set(XML_INCLUDE_DIRS ${XML_INCLUDE_DIRS} ${ICU_INCLUDE_DIRS})
endif()
else()
if (NOT TARGET xerces-c)
set(XERCES_C_REPO https://github.com/apache/xerces-c.git)
FetchContent_Declare(
xerces-c
EXCLUDE_FROM_ALL
GIT_REPOSITORY ${XERCES_C_REPO}
GIT_TAG ${XERCES_C_DEFAULT_FETCH_TAG}
GIT_SHALLOW TRUE
)
FetchContent_MakeAvailable(xerces-c)
endif()
set(XML_LIBRARIES "xerces-c")
get_target_property(XercesC_INCLUDE_DIRS xerces-c INCLUDE_DIRECTORIES)
set(XML_INCLUDE_DIRS ${XercesC_INCLUDE_DIRS})
endif()
if(NOT BUILD_SHARED_LIBS)
list(APPEND compiler_definitions XERCES_STATIC_LIBRARY)
endif()
# Add ICU in Linux Systems
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Apple")
list(APPEND compiler_definitions LINUX)
find_package(ICU REQUIRED)
set(XML_LIBRARIES ${XML_LIBRARIES} ${ICU_LIBRARIES})
set(XML_INCLUDE_DIRS ${XML_INCLUDE_DIRS} ${ICU_INCLUDE_DIRS})
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
list(APPEND compiler_definitions WINDOWS)
endif()
# Find Boost (Required by Tools)
if(BUILD_TOOLS)
if(NOT BUILD_SHARED_LIBS)

14
src/lib/CMakeLists.txt
View File

@@ -28,9 +28,14 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE ${compiler_definitions})
target_link_options(${PROJECT_NAME} PRIVATE ${linker_flags})
target_include_directories(${PROJECT_NAME}
PRIVATE
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
${CMAKE_CURRENT_SOURCE_DIR}/include
)
target_include_directories(${PROJECT_NAME}
PRIVATE
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
${XML_INCLUDE_DIRS}
)
@@ -52,9 +57,14 @@ target_compile_definitions(${PROJECT_NAME}las PRIVATE ${compiler_definitions})
target_link_options(${PROJECT_NAME}las PRIVATE ${linker_flags})
target_include_directories(${PROJECT_NAME}las
PRIVATE
PUBLIC
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
${CMAKE_CURRENT_SOURCE_DIR}/include
)
target_include_directories(${PROJECT_NAME}las
PRIVATE
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
${XML_INCLUDE_DIRS}
)