Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: some cleanup

Browse Source
This commit is contained in:
pk
2019-07-15 11:05:43 +03:00
parent 7be4d12749
commit 1d52cf1d2d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/cmake/init.cmake
View File

@@ -36,7 +36,7 @@ if(MSVC)
"Flags used by the CXX compiler during ${cfg_upper} builds." FORCE) "Flags used by the CXX compiler during ${cfg_upper} builds." FORCE)
endif() endif()
endforeach() endforeach()
if(wxBUILD_MSVC_MULTIPROC) if(wxBUILD_MSVC_MULTIPROC)
wx_string_append(CMAKE_C_FLAGS " /MP") wx_string_append(CMAKE_C_FLAGS " /MP")
wx_string_append(CMAKE_CXX_FLAGS " /MP") wx_string_append(CMAKE_CXX_FLAGS " /MP")
@@ -44,7 +44,13 @@ if(MSVC)
elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")) elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
if(wxBUILD_USE_STATIC_RUNTIME) if(wxBUILD_USE_STATIC_RUNTIME)
if(MINGW) if(MINGW)
set(STATIC_LINKER_FLAGS " -static -Wl,--exclude-libs=libgcc_eh.a -Wl,--exclude-libs=libpthread.a") set(STATIC_LINKER_FLAGS " -static")
set(EXCLUDED_LIBS gcc_eh
pthread
)
foreach(lib ${EXCLUDED_LIBS})
wx_string_append(STATIC_LINKER_FLAGS " -Wl,--exclude-libs=lib${lib}.a")
endforeach()
else() else()
set(STATIC_LINKER_FLAGS " -static-libgcc -static-libstdc++") set(STATIC_LINKER_FLAGS " -static-libgcc -static-libstdc++")
endif() endif()