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

refactor libslic3r dependencies

Browse Source
This commit is contained in:
Joseph Lenox 2018-06-21 23:25:43 -05:00 committed by Joseph Lenox
parent e7d72c1b2c
commit 9dcaaf8ef8
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/CMakeLists.txt
View File

@ -4,6 +4,8 @@ project (slic3r)
option(GUI_BUILD_TESTS "Build tests for Slic3r GUI." ON) option(GUI_BUILD_TESTS "Build tests for Slic3r GUI." ON)
option(SLIC3R_BUILD_TESTS "Build tests for libslic3r." ON) option(SLIC3R_BUILD_TESTS "Build tests for libslic3r." ON)
option(SLIC3R_STATIC "Build and link Slic3r statically." ON)
option(BUILD_EXTRUDE_TIN "Build and link the extrude-tin application." OFF)
# only on newer GCCs: -ftemplate-backtrace-limit=0 # only on newer GCCs: -ftemplate-backtrace-limit=0
set(CMAKE_CXX_FLAGS "-g ${CMAKE_CXX_FLAGS} -Wall -DM_PI=3.14159265358979323846 -D_GLIBCXX_USE_C99 -DHAS_BOOL -DNOGDI -DBOOST_ASIO_DISABLE_KQUEUE") set(CMAKE_CXX_FLAGS "-g ${CMAKE_CXX_FLAGS} -Wall -DM_PI=3.14159265358979323846 -D_GLIBCXX_USE_C99 -DHAS_BOOL -DNOGDI -DBOOST_ASIO_DISABLE_KQUEUE")
@ -46,7 +48,6 @@ ELSE(CMAKE_HOST_APPLE)
# set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -L.") # set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -L.")
ENDIF(CMAKE_HOST_APPLE) ENDIF(CMAKE_HOST_APPLE)
option(SLIC3R_STATIC "Build and link Slic3r statically." ON)
if(SLIC3R_STATIC) if(SLIC3R_STATIC)
set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON)
@ -138,6 +139,8 @@ add_library(libslic3r STATIC
) )
target_compile_features(libslic3r PUBLIC cxx_std_11) target_compile_features(libslic3r PUBLIC cxx_std_11)
add_library(BSpline STATIC add_library(BSpline STATIC
${LIBDIR}/BSpline/BSpline.cpp ${LIBDIR}/BSpline/BSpline.cpp
) )
@ -167,6 +170,8 @@ add_library(poly2tri STATIC
${LIBDIR}/poly2tri/sweep/sweep.cc ${LIBDIR}/poly2tri/sweep/sweep.cc
) )
set(UI_TEST_SOURCES set(UI_TEST_SOURCES
${GUI_TESTDIR}/testableframe.cpp ${GUI_TESTDIR}/testableframe.cpp
${GUI_TESTDIR}/test_harness_gui.cpp ${GUI_TESTDIR}/test_harness_gui.cpp
@ -179,9 +184,6 @@ add_executable(slic3r slic3r.cpp)
#set_target_properties(slic3r PROPERTIES LINK_SEARCH_START_STATIC 1) #set_target_properties(slic3r PROPERTIES LINK_SEARCH_START_STATIC 1)
#set_target_properties(slic3r PROPERTIES LINK_SEARCH_END_STATIC 1) #set_target_properties(slic3r PROPERTIES LINK_SEARCH_END_STATIC 1)
#add_executable(extrude-tin utils/extrude-tin.cpp)
#set_target_properties(extrude-tin PROPERTIES LINK_SEARCH_START_STATIC 1)
#set_target_properties(extrude-tin PROPERTIES LINK_SEARCH_END_STATIC 1)
set(Boost_USE_STATIC_LIBS OFF) set(Boost_USE_STATIC_LIBS OFF)
set(Boost_USE_STATIC_RUNTIME OFF) set(Boost_USE_STATIC_RUNTIME OFF)
@ -208,6 +210,18 @@ IF(CMAKE_HOST_UNIX)
#set(Boost_LIBRARIES bsystem bthread bfilesystem) #set(Boost_LIBRARIES bsystem bthread bfilesystem)
ENDIF(CMAKE_HOST_UNIX) ENDIF(CMAKE_HOST_UNIX)
# Libraries that Libslic3r itself depends on.
set(LIBSLIC3R_DEPENDS
admesh
BSpline
clipper
expat
polypartition
poly2tri
ZipArchive
${Boost_LIBRARIES}
)
IF(wxWidgets_FOUND) IF(wxWidgets_FOUND)
MESSAGE("wx found!") MESSAGE("wx found!")
@ -287,7 +301,13 @@ ELSE(wxWidgets_FOUND)
#skip gui when no wx included #skip gui when no wx included
ENDIF(wxWidgets_FOUND) ENDIF(wxWidgets_FOUND)
target_link_libraries (slic3r libslic3r admesh BSpline clipper expat polypartition poly2tri ZipArchive ${Boost_LIBRARIES}) target_link_libraries (slic3r libslic3r ${LIBSLIC3R_DEPENDS})
if (BUILD_EXTRUDE_TIN)
add_executable(extrude-tin utils/extrude-tin.cpp)
set_target_properties(extrude-tin PROPERTIES LINK_SEARCH_START_STATIC 1)
set_target_properties(extrude-tin PROPERTIES LINK_SEARCH_END_STATIC 1)
endif()
# Windows needs a compiled component for Boost.nowide # Windows needs a compiled component for Boost.nowide
IF (WIN32) IF (WIN32)
@ -303,7 +323,9 @@ IF (WIN32)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
set(CMAKE_EXE_LINKER_FLAGS "-Wl,--allow-multiple-definition") set(CMAKE_EXE_LINKER_FLAGS "-Wl,--allow-multiple-definition")
endif() endif()
# target_link_libraries(extrude-tin boost-nowide) if (BUILD_EXTRUDE_TIN)
target_link_libraries(extrude-tin boost-nowide)
endif()
ENDIF(WIN32) ENDIF(WIN32)
@ -339,9 +361,9 @@ if (SLIC3R_BUILD_TESTS)
endif() endif()
add_executable(slic3r_test ${SLIC3R_TEST_SOURCES}) add_executable(slic3r_test ${SLIC3R_TEST_SOURCES})
add_test(NAME TestSlic3r COMMAND slic3r_test) add_test(NAME TestSlic3r COMMAND slic3r_test)
target_link_libraries(slic3r_test PUBLIC libslic3r Catch admesh BSpline clipper expat polypartition poly2tri ZipArchive ${Boost_LIBRARIES}) target_link_libraries(slic3r_test PUBLIC libslic3r Catch ${LIBSLIC3R_DEPENDS})
endif() endif()
if (BUILD_EXTRUDE_TIN)
target_link_libraries (extrude-tin libslic3r ${LIBSLIC3R_DEPENDS})
#target_link_libraries (extrude-tin libslic3r admesh BSpline clipper expat polypartition poly2tri ${Boost_LIBRARIES}) endif()