Permalink
Browse files

Buildsystem: Make options load BEFORE platformchecks, so they are pre…

…loaded correctly

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

--HG--
branch : trunk
  • Loading branch information...
1 parent a6d681b commit 3fa20f4cf340e9f28e450ba388b16f7849f07d11 click committed Aug 28, 2010
Showing with 19 additions and 11 deletions.
  1. +10 −9 CMakeLists.txt
  2. +4 −0 cmake/compiler/gcc/settings.cmake
  3. +1 −1 cmake/options.cmake
  4. +4 −1 cmake/platform/settings.unix.cmake
View
@@ -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)
@@ -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()
View
@@ -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 )
@@ -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)
-

0 comments on commit 3fa20f4

Please sign in to comment.