From 2bdb86c7ed2d621334653db67e2a2b17edd0f71c Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Mon, 3 Dec 2018 10:48:06 +0100 Subject: [PATCH] deps: warn that wx-config can't be moved into another location --- CMakeLists.txt | 9 +++++---- deps/CMakeLists.txt | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bee6c59b..7e094a85f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,11 +44,12 @@ endif () # 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 -if(NOT DEFINED CMAKE_PREFIX_PATH) - if(DEFINED ENV{CMAKE_PREFIX_PATH}) +if (NOT DEFINED CMAKE_PREFIX_PATH) + if (DEFINED 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. list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules/) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index e2c525480..8f98e0bda 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -15,6 +15,9 @@ # 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. # +# 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) cmake_minimum_required(VERSION 3.2)