3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Yet another build system fix

Browse Source
This commit is contained in:
bubnikv 2018-09-19 14:43:38 +02:00
parent 8f01266ca4
commit ffac360439
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -70,6 +70,6 @@ if (SLIC3R_GUI)
elseif (APPLE) elseif (APPLE)
target_link_libraries(slic3r "-framework OpenGL") target_link_libraries(slic3r "-framework OpenGL")
else () else ()
target_link_libraries(slic3r -lGL -lGLU) target_link_libraries(slic3r -ldl -lGL -lGLU)
endif () endif ()
endif () endif ()

11
xs/CMakeLists.txt
View File

@ -109,7 +109,8 @@ target_link_libraries(XS ${Boost_LIBRARIES})
if (APPLE) if (APPLE)
# add_compile_options(-stdlib=libc++) # add_compile_options(-stdlib=libc++)
# add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE) # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
target_link_libraries(XS "-framework IOKit" "-framework CoreFoundation" -lc++) # -liconv: boost links to libiconv by default
target_link_libraries(XS "-liconv -framework IOKit" "-framework CoreFoundation" -lc++)
elseif (MSVC) elseif (MSVC)
target_link_libraries(XS ) target_link_libraries(XS )
else () else ()
@ -142,14 +143,6 @@ if (WIN32)
target_link_libraries(XS ${PERL_LIBRARY}) target_link_libraries(XS ${PERL_LIBRARY})
endif() endif()
# Find and configure boost
if(SLIC3R_STATIC)
# Use static boost libraries.
set(Boost_USE_STATIC_LIBS ON)
# Use boost libraries linked statically to the C++ runtime.
# set(Boost_USE_STATIC_RUNTIME ON)
endif()
target_link_libraries(XS ${Boost_LIBRARIES}) target_link_libraries(XS ${Boost_LIBRARIES})
target_link_libraries(XS ${TBB_LIBRARIES}) target_link_libraries(XS ${TBB_LIBRARIES})
# target_link_libraries(XS ${wxWidgets_LIBRARIES}) # target_link_libraries(XS ${wxWidgets_LIBRARIES})