Skip to content

fix: Require boost regex and link static libstdc++ and libgcc #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juliusknorr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Require boost regex and link static libstdc++ and libgcc #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions X2tConverter/build/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ set(CORE_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../../..")

include(${CORE_ROOT_DIR}/common.cmake)

find_package(Boost REQUIRED COMPONENTS regex)

set(X2T_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../..")

add_subdirectory(library)
Expand All @@ -19,6 +21,7 @@ set_default_options(x2t)
# dynamic libs
target_link_libraries(x2t PRIVATE
x2tlib
Boost::regex
)

copy_artifacts_to_folder("x2t" "${EO_CORE_OUTPUT_DIR}")
12 changes: 12 additions & 0 deletions common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
include_guard(GLOBAL)

# CMake 3.25+ sets LINUX automatically; older versions (Ubuntu 22.04 ships 3.22) do not.
if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT DEFINED LINUX)
set(LINUX TRUE)
endif()

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
Expand Down Expand Up @@ -82,6 +87,13 @@ set(COMMON_C_FLAGS

set(COMMON_LINK_OPTIONS
"-Wl,--disable-new-dtags"
# Statically bundle the C++ runtime and GCC support library into each
# binary/shared-library so the GLIBCXX version on the target system is
# irrelevant. Note: glibc itself cannot be statically linked into .so
# files, so the build image must still target a suitably old glibc
# (see Dockerfile core stage).
-static-libstdc++
-static-libgcc
)


Expand Down
Loading