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

deps: warn that wx-config can't be moved into another location

Browse Source
This commit is contained in:
Vojtech Kral 2018-12-03 10:48:06 +01:00
parent e1c90c83e8
commit 2bdb86c7ed
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -44,11 +44,12 @@ endif ()
# CMAKE_PREFIX_PATH is used to point CMake to the remaining dependencies (Boost, TBB, ...) # CMAKE_PREFIX_PATH is used to point CMake to the remaining dependencies (Boost, TBB, ...)
# We pick it from environment if it is not defined in another way # We pick it from environment if it is not defined in another way
if(NOT DEFINED CMAKE_PREFIX_PATH) if (NOT DEFINED CMAKE_PREFIX_PATH)
if(DEFINED ENV{CMAKE_PREFIX_PATH}) if (DEFINED ENV{CMAKE_PREFIX_PATH})
set(CMAKE_PREFIX_PATH "$ENV{CMAKE_PREFIX_PATH}") set(CMAKE_PREFIX_PATH "$ENV{CMAKE_PREFIX_PATH}")
endif() endif ()
endif() endif ()
message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
# Add our own cmake module path. # Add our own cmake module path.
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules/) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules/)

3
deps/CMakeLists.txt vendored
View File

@ -15,6 +15,9 @@
# On Windows, architecture (64 vs 32 bits) is judged based on the compiler variant. # On Windows, architecture (64 vs 32 bits) is judged based on the compiler variant.
# To build dependencies for either 64 or 32 bit OS, use the respective compiler command line. # To build dependencies for either 64 or 32 bit OS, use the respective compiler command line.
# #
# WARNING: On UNIX platforms wxWidgets hardcode the destdir path into its `wx-conffig` utility,
# therefore, unfortunatelly, the installation cannot be copied/moved elsewhere without re-installing wxWidgets.
#
project(Slic3r-deps) project(Slic3r-deps)
cmake_minimum_required(VERSION 3.2) cmake_minimum_required(VERSION 3.2)