Skip to content

feat: option to use static stdc++ & gcc libs #164

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

Merged
9prady9 merged 1 commit into from
Mar 16, 2018
Merged

feat: option to use static stdc++ & gcc libs #164

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
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ include(platform)
option(BUILD_SHARED_LIBS "Build shared/static library" ON)
option(USE_HUNTER "Use Hunter cmake package handler" OFF)
option(USE_STATIC_FREEIMAGE "Use static version of freeimage" OFF)
option(USE_STATIC_STDCPP "Use static libstdc++ for generating forge library" OFF)
option(USE_STATIC_GCC "Use static libgcc for generating forge library" OFF)
mark_as_advanced(USE_STATIC_STDCPP)
mark_as_advanced(USE_STATIC_GCC)

if(USE_HUNTER)
set(HUNTER_TLS_VERIFY OFF)
Expand Down
12 changes: 7 additions & 5 deletions src/backend/opengl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,13 @@ target_link_libraries(${BackendTarget}
)

if(UNIX)
target_link_libraries(${BackendTarget}
PRIVATE
FontConfig::FontConfig
${X11_X11_LIB}
)
target_link_libraries(${BackendTarget}
PRIVATE
FontConfig::FontConfig
${X11_X11_LIB}
$<$<AND:$<CXX_COMPILER_ID:GNU>,$<BOOL:${USE_STATIC_STDCPP}>>:-static-libstdc++>
$<$<AND:$<C_COMPILER_ID:GNU>,$<BOOL:${USE_STATIC_GCC}>>:-static-libgcc>
)
endif(UNIX)

add_dependencies(${BackendTarget} ${glsl_shader_targets})
Expand Down