From 58dafd94e23e88407e73416b5093800baf7d190b Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Sun, 19 Sep 2010 18:17:53 +0200
Subject: BuildSystem/Platforms: Move platform-specific settings into
 respective directories, consistent with what is done with compilers.
 BuildSystem/GCC: Add some additional parameters when using SFMT

--HG--
branch : trunk
---
 cmake/compiler/gcc/settings.cmake   |  4 ++--
 cmake/macros/CheckPlatform.cmake    |  6 +++---
 cmake/platform/osx/settings.cmake   | 29 +++++++++++++++++++++++++++++
 cmake/platform/settings.osx.cmake   | 29 -----------------------------
 cmake/platform/settings.unix.cmake  | 27 ---------------------------
 cmake/platform/settings.win32.cmake | 28 ----------------------------
 cmake/platform/unix/settings.cmake  | 27 +++++++++++++++++++++++++++
 cmake/platform/win/settings.cmake   | 28 ++++++++++++++++++++++++++++
 8 files changed, 89 insertions(+), 89 deletions(-)
 create mode 100644 cmake/platform/osx/settings.cmake
 delete mode 100644 cmake/platform/settings.osx.cmake
 delete mode 100644 cmake/platform/settings.unix.cmake
 delete mode 100644 cmake/platform/settings.win32.cmake
 create mode 100644 cmake/platform/unix/settings.cmake
 create mode 100644 cmake/platform/win/settings.cmake

diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake
index d6d2c4168e0..f7b3638f6a5 100644
--- a/cmake/compiler/gcc/settings.cmake
+++ b/cmake/compiler/gcc/settings.cmake
@@ -1,8 +1,8 @@
 add_definitions(-fno-delete-null-pointer-checks)
 
 if( USE_SFMT)
-  add_definitions(-msse2)
-  message(STATUS "- GCC: SFMT enabled, SSE2 flag forced")
+  add_definitions(-msse2 -mfpmath=sse -DHAVE_SSE2 -D__SSE2__)
+  message(STATUS "- GCC: SFMT enabled, SSE2 flags forced")
 endif()
 
 if( WITH_WARNINGS )
diff --git a/cmake/macros/CheckPlatform.cmake b/cmake/macros/CheckPlatform.cmake
index a9c80458c02..0cdf5d8ffbf 100644
--- a/cmake/macros/CheckPlatform.cmake
+++ b/cmake/macros/CheckPlatform.cmake
@@ -11,9 +11,9 @@ endif()
 include("${CMAKE_SOURCE_DIR}/cmake/platform/settings.cmake")
 
 if(WIN32)
-  include("${CMAKE_SOURCE_DIR}/cmake/platform/settings.win32.cmake")
+  include("${CMAKE_SOURCE_DIR}/cmake/platform/win/settings.cmake")
 elseif(APPLE)
-  include("${CMAKE_SOURCE_DIR}/cmake/platform/settings.osx.cmake")
+  include("${CMAKE_SOURCE_DIR}/cmake/platform/osx/settings.cmake")
 elseif(UNIX)
-  include("${CMAKE_SOURCE_DIR}/cmake/platform/settings.unix.cmake")
+  include("${CMAKE_SOURCE_DIR}/cmake/platform/unix/settings.cmake")
 endif()
diff --git a/cmake/platform/osx/settings.cmake b/cmake/platform/osx/settings.cmake
new file mode 100644
index 00000000000..eb623066822
--- /dev/null
+++ b/cmake/platform/osx/settings.cmake
@@ -0,0 +1,29 @@
+set(MACOSX 1)
+set(OSX_LIBS /usr/lib/libcrypto.dylib)
+add_definitions(-D__ASSERTMACROS__)
+
+# set default configuration directory
+if( NOT CONF_DIR )
+  set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc)
+  message(STATUS "OSX: Using default configuration directory")
+endif()
+
+# set default library directory
+if( NOT LIBSDIR )
+  set(LIBSDIR ${CMAKE_INSTALL_PREFIX}/lib)
+  message(STATUS "OSX: Using default library directory")
+endif()
+
+# configure uninstaller
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+  IMMEDIATE @ONLY
+)
+message(STATUS "OSX: 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 "OSX: Created uninstall target")
diff --git a/cmake/platform/settings.osx.cmake b/cmake/platform/settings.osx.cmake
deleted file mode 100644
index eb623066822..00000000000
--- a/cmake/platform/settings.osx.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-set(MACOSX 1)
-set(OSX_LIBS /usr/lib/libcrypto.dylib)
-add_definitions(-D__ASSERTMACROS__)
-
-# set default configuration directory
-if( NOT CONF_DIR )
-  set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc)
-  message(STATUS "OSX: Using default configuration directory")
-endif()
-
-# set default library directory
-if( NOT LIBSDIR )
-  set(LIBSDIR ${CMAKE_INSTALL_PREFIX}/lib)
-  message(STATUS "OSX: Using default library directory")
-endif()
-
-# configure uninstaller
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-  IMMEDIATE @ONLY
-)
-message(STATUS "OSX: 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 "OSX: Created uninstall target")
diff --git a/cmake/platform/settings.unix.cmake b/cmake/platform/settings.unix.cmake
deleted file mode 100644
index 9dae9f5ca9f..00000000000
--- a/cmake/platform/settings.unix.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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
-configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-  "${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)
diff --git a/cmake/platform/settings.win32.cmake b/cmake/platform/settings.win32.cmake
deleted file mode 100644
index b66eb2da7bb..00000000000
--- a/cmake/platform/settings.win32.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-# Platform-specfic options
-option(USE_MYSQL_SOURCES "Use included MySQL-sources to build libraries" 1)
-
-# Package overloads
-set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/acelite)
-set(ACE_LIBRARY "ace")
-set(BZIP2_LIBRARIES "bzip2")
-set(ZLIB_LIBRARIES "zlib")
-
-if( USE_MYSQL_SOURCES )
-  set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/mysqllite/include)
-  set(MYSQL_LIBRARY "libmysql")
-  set( MYSQL_FOUND 1 )
-  message(STATUS "Using supplied MySQL sources")
-endif()
-
-# check the CMake preload parameters (commented out by default)
-
-# overload CMAKE_INSTALL_PREFIX if not being set properly
-#if( WIN32 )
-#  if( NOT CYGWIN )
-#    if( NOT CMAKE_INSTALL_PREFIX )
-#      set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/bin")
-#    endif()
-#  endif()
-#endif()
-
-include(${CMAKE_SOURCE_DIR}/cmake/compiler/msvc/settings.cmake)
diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake
new file mode 100644
index 00000000000..9dae9f5ca9f
--- /dev/null
+++ b/cmake/platform/unix/settings.cmake
@@ -0,0 +1,27 @@
+# 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
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+  "${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)
diff --git a/cmake/platform/win/settings.cmake b/cmake/platform/win/settings.cmake
new file mode 100644
index 00000000000..b66eb2da7bb
--- /dev/null
+++ b/cmake/platform/win/settings.cmake
@@ -0,0 +1,28 @@
+# Platform-specfic options
+option(USE_MYSQL_SOURCES "Use included MySQL-sources to build libraries" 1)
+
+# Package overloads
+set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/acelite)
+set(ACE_LIBRARY "ace")
+set(BZIP2_LIBRARIES "bzip2")
+set(ZLIB_LIBRARIES "zlib")
+
+if( USE_MYSQL_SOURCES )
+  set(MYSQL_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/mysqllite/include)
+  set(MYSQL_LIBRARY "libmysql")
+  set( MYSQL_FOUND 1 )
+  message(STATUS "Using supplied MySQL sources")
+endif()
+
+# check the CMake preload parameters (commented out by default)
+
+# overload CMAKE_INSTALL_PREFIX if not being set properly
+#if( WIN32 )
+#  if( NOT CYGWIN )
+#    if( NOT CMAKE_INSTALL_PREFIX )
+#      set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/bin")
+#    endif()
+#  endif()
+#endif()
+
+include(${CMAKE_SOURCE_DIR}/cmake/compiler/msvc/settings.cmake)
-- 
cgit v1.2.3