Buildsystem: Make options load BEFORE platformchecks, so they are preloaded correctly

+ add some more output to make it easier to find possible issues with the new layout

--HG--
branch : trunk

4 files changed, 19 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09623cd0e7d..5fece05a377 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,16 @@ endif()
 
 include(CheckCXXSourceRuns)
 include(CheckIncludeFiles)
+
+# turn off PCH totally if enabled (hidden setting, mainly for devs)
+if( NOPCH )
+  set(USE_COREPCH 0)
+  set(USE_SCRIPTPCH 0)
+endif()
+
+# set default buildoptions and print them
+include(cmake/options.cmake)
+
 include(CheckPlatform)
 
 # basic packagesearching and setup (further support will be needed, this is a preliminary release!)
@@ -51,15 +61,6 @@ execute_process(
   OUTPUT_VARIABLE HG_REVISION
 )
 
-# turn off PCH totally if enabled (hidden setting, mainly for devs)
-if( NOPCH )
-  set(USE_COREPCH 0)
-  set(USE_SCRIPTPCH 0)
-endif()
-
-# set default buildoptions and print them
-include(cmake/options.cmake)
-
 # add and generate revision.h
 add_subdirectory(src/genrevision)
 
diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake
index 1d981509972..d6d2c4168e0 100644
--- a/cmake/compiler/gcc/settings.cmake
+++ b/cmake/compiler/gcc/settings.cmake
@@ -2,14 +2,18 @@ add_definitions(-fno-delete-null-pointer-checks)
 
 if( USE_SFMT)
   add_definitions(-msse2)
+  message(STATUS "- GCC: SFMT enabled, SSE2 flag forced")
 endif()
 
 if( WITH_WARNINGS )
   add_definitions(-Wall -Wfatal-errors -Wextra)
+  message(STATUS "- GCC: All warnings enabled")
 else()
   add_definitions(--no-warnings)
+  message(STATUS "- GCC: All warnings disabled")
 endif()
 
 if( WITH_COREDEBUG )
   add_definitions(-ggdb3)
+  message(STATUS "- GCC: Debug-flags set (-ggdb3)")
 endif()
diff --git a/cmake/options.cmake b/cmake/options.cmake
index 74f25621d44..270091432f0 100644
--- a/cmake/options.cmake
+++ b/cmake/options.cmake
@@ -49,7 +49,7 @@ if( SCRIPTS )
   add_definitions(-DSCRIPTS)
 else()
   message("* Build with scripts     : No")
-  set(SCRIPTPCH 0)
+  set(USE_SCRIPTPCH 0)
 endif()
 
 if( TOOLS )
diff --git a/cmake/platform/settings.unix.cmake b/cmake/platform/settings.unix.cmake
index 6751f43b367..9dae9f5ca9f 100644
--- a/cmake/platform/settings.unix.cmake
+++ b/cmake/platform/settings.unix.cmake
@@ -1,11 +1,13 @@
 # set default configuration directory
 if( NOT CONF_DIR )
   set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc)
+  message(STATUS "UNIX: Using default configuration directory")
 endif()
 
 # set default library directory
 if( NOT LIBSDIR )
   set(LIBSDIR ${CMAKE_INSTALL_PREFIX}/lib)
+  message(STATUS "UNIX: Using default library directory")
 endif()
 
 # configure uninstaller
@@ -14,11 +16,12 @@ configure_file(
   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
   IMMEDIATE @ONLY
 )
+message(STATUS "UNIX: Configuring uninstall target")
 
 # create uninstaller target (allows for using "make uninstall")
 add_custom_target(uninstall
   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
 )
+message(STATUS "UNIX: Created uninstall target")
 
 include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake)
-