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

made SLIC3R_STATIC a -D option instead of environment var

Browse Source
This commit is contained in:
Joseph Lenox 2018-05-10 18:48:04 -05:00 committed by Joseph Lenox
parent 375663c381
commit 1f82f74799
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/CMakeLists.txt
View File

@ -173,15 +173,15 @@ add_library(bthread SHARED IMPORTED)
set_target_properties(bthread PROPERTIES IMPORTED_LOCATION ${bthread_l}) set_target_properties(bthread PROPERTIES IMPORTED_LOCATION ${bthread_l})
include_directories(${Boost_INCLUDE_DIRS}) include_directories(${Boost_INCLUDE_DIRS})
if(DEFINED ENV{SLIC3R_STATIC}) if(${SLIC3R_STATIC})
set(wxWidgets_USE_STATIC ON) set(wxWidgets_USE_STATIC ON)
ELSE(DEFINED ENV{SLIC3R_STATIC}) else(${SLIC3R_STATIC})
set(wxWidgets_USE_STATIC OFF) set(wxWidgets_USE_STATIC OFF)
ENDIF(DEFINED ENV{SLIC3R_STATIC}) endif(${SLIC3R_STATIC})
set(wxWidgets_USE_UNICODE ON) set(wxWidgets_USE_UNICODE ON)
find_package(wxWidgets COMPONENTS base aui core html) find_package(wxWidgets COMPONENTS net gl html aui core base)
IF(CMAKE_HOST_UNIX) IF(CMAKE_HOST_UNIX)
#set(Boost_LIBRARIES bsystem bthread bfilesystem) #set(Boost_LIBRARIES bsystem bthread bfilesystem)