From 58dafd94e23e88407e73416b5093800baf7d190b Mon Sep 17 00:00:00 2001 From: click Date: Sun, 19 Sep 2010 18:17:53 +0200 Subject: [PATCH] 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/{settings.osx.cmake => osx/settings.cmake} | 0 cmake/platform/{settings.unix.cmake => unix/settings.cmake} | 0 cmake/platform/{settings.win32.cmake => win/settings.cmake} | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename cmake/platform/{settings.osx.cmake => osx/settings.cmake} (100%) rename cmake/platform/{settings.unix.cmake => unix/settings.cmake} (100%) rename cmake/platform/{settings.win32.cmake => win/settings.cmake} (100%) diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake index d6d2c4168e..f7b3638f6a 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 a9c80458c0..0cdf5d8ffb 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/settings.osx.cmake b/cmake/platform/osx/settings.cmake similarity index 100% rename from cmake/platform/settings.osx.cmake rename to cmake/platform/osx/settings.cmake diff --git a/cmake/platform/settings.unix.cmake b/cmake/platform/unix/settings.cmake similarity index 100% rename from cmake/platform/settings.unix.cmake rename to cmake/platform/unix/settings.cmake diff --git a/cmake/platform/settings.win32.cmake b/cmake/platform/win/settings.cmake similarity index 100% rename from cmake/platform/settings.win32.cmake rename to cmake/platform/win/settings.cmake