From 1f82f7479944932b0fccc7f7876165d4eb2fb41e Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Thu, 10 May 2018 18:48:04 -0500 Subject: [PATCH] made SLIC3R_STATIC a -D option instead of environment var --- src/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6db5c038e..d99259a0b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -173,15 +173,15 @@ add_library(bthread SHARED IMPORTED) set_target_properties(bthread PROPERTIES IMPORTED_LOCATION ${bthread_l}) include_directories(${Boost_INCLUDE_DIRS}) -if(DEFINED ENV{SLIC3R_STATIC}) +if(${SLIC3R_STATIC}) set(wxWidgets_USE_STATIC ON) -ELSE(DEFINED ENV{SLIC3R_STATIC}) +else(${SLIC3R_STATIC}) set(wxWidgets_USE_STATIC OFF) -ENDIF(DEFINED ENV{SLIC3R_STATIC}) +endif(${SLIC3R_STATIC}) 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) #set(Boost_LIBRARIES bsystem bthread bfilesystem)