GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-01 04:51:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Be more selective in what is compiled with C++11.

Browse Source
This commit is contained in:
Joseph Lenox 2018-04-29 10:08:10 -05:00
parent 44944a9b7d
commit bd6fe7114a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -3,7 +3,7 @@ project (slic3r)
# only on newer GCCs: -ftemplate-backtrace-limit=0 # only on newer GCCs: -ftemplate-backtrace-limit=0
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -DM_PI=3.14159265358979323846 -D_GLIBCXX_USE_C99 -DHAS_BOOL -DNOGDI -DBOOST_ASIO_DISABLE_KQUEUE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -DM_PI=3.14159265358979323846 -D_GLIBCXX_USE_C99 -DHAS_BOOL -DNOGDI -DBOOST_ASIO_DISABLE_KQUEUE")
execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_VERSION ERROR_QUIET) execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_VERSION ERROR_QUIET)
@ -103,6 +103,7 @@ add_library(libslic3r STATIC
${LIBDIR}/libslic3r/SVG.cpp ${LIBDIR}/libslic3r/SVG.cpp
${LIBDIR}/libslic3r/TriangleMesh.cpp ${LIBDIR}/libslic3r/TriangleMesh.cpp
) )
target_compile_features(libslic3r PUBLIC cxx_std_11)
add_library(BSpline STATIC add_library(BSpline STATIC
${LIBDIR}/BSpline/BSpline.cpp ${LIBDIR}/BSpline/BSpline.cpp
@ -188,6 +189,7 @@ IF(wxWidgets_FOUND)
${GUI_LIBDIR}/Settings.cpp ${GUI_LIBDIR}/Settings.cpp
${GUI_LIBDIR}/misc_ui.cpp ${GUI_LIBDIR}/misc_ui.cpp
) )
target_compile_features(slic3r_gui PUBLIC cxx_std_11)
#only build GUI lib if building with wx #only build GUI lib if building with wx
target_link_libraries (slic3r slic3r_gui ${wxWidgets_LIBRARIES}) target_link_libraries (slic3r slic3r_gui ${wxWidgets_LIBRARIES})
ELSE(wxWidgets_FOUND) ELSE(wxWidgets_FOUND)