From 89573dc3ca585f957a3716d90cba6e73a42f3ff0 Mon Sep 17 00:00:00 2001 From: Hombre Date: Thu, 30 Dec 2010 14:09:47 +0100 Subject: [PATCH] Correcting a bug that crashed the cmake process if ran by CMakeGUI --- CMakeLists.txt | 4 ++++ Win32CMakeOptions-Sample.txt | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 824cb527e..8ec5aefe4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,10 @@ set (CMAKE_BUILD_TYPE Debug CACHE STRING "One of: None Debug Release RelWithDebI # gives the same result/behaviour as before. set (RTENGINE_CXX_FLAGS "-ffast-math -funroll-loops" CACHE STRING "Special compilation flags for RTEngine") +if (WIN32) + set(CMAKE_PREFIX_PATH $ENV{MINGW_BASEPATH} $ENV{GTKMM_BASEPATH} CACHE STRING "Additional search paths") +endif (WIN32) + if (APPLE) # SET (CMAKE_OSX_ARCHITECTURES "i386;x86_64;" ) # SET (CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "i386;x86_64;" ) diff --git a/Win32CMakeOptions-Sample.txt b/Win32CMakeOptions-Sample.txt index 626c83f10..df000fe25 100644 --- a/Win32CMakeOptions-Sample.txt +++ b/Win32CMakeOptions-Sample.txt @@ -9,8 +9,6 @@ set(DATADIR . CACHE PATH "Datas installation path") set(BINDIR . CACHE PATH "Binaries installation path") set(LIBDIR . CACHE PATH "Libraries installation path") -set(CMAKE_PREFIX_PATH $ENV{MINGW_BASEPATH} $ENV{GTKMM_BASEPATH} CACHE STRING "Additional search paths") - set(BUILD_SHARED OFF CACHE BOOL "Should RT generate shared libraries") set(WITH_RAWZOR ON CACHE BOOL "With Rawzor") set(OPTION_OMP ON CACHE BOOL "Use OpenMP to speedup the preview and batch processing")