Move msvc compiler options to OptiomalOptions.cmake

castano · Oct 8, 2007 · b2a0160 · b2a0160
1 parent e7aca55
commit b2a0160
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,23 +11,6 @@ IF(WIN32)
 	SET(CMAKE_LIBRARY_PATH "${GNUWIN32}/lib")
 ENDIF(WIN32)
 
-IF(MSVC)
-	# @@ Some of these might only be available in VC8.
-	# Code generation flags.
-#	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:SSE2 /fp:fast")
-#	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2 /fp:fast")
-
-	# Optimization flags.
-	SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} /O2 /Ob2 /Oi /Ot /Oy /GL")
-	SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} /O2 /Ob2 /Oi /Ot /Oy /GL")
-	SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
-	SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
-	SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")
-
-	# Definitions.
-	ADD_DEFINITIONS(-D__SSE2__ -D__SSE__ -D__MMX__)
-ENDIF(MSVC)
-
 INCLUDE(${NV_CMAKE_DIR}/OptimalOptions.cmake)
 MESSAGE(STATUS "Setting optimal options")
 MESSAGE(STATUS "  Processor: ${NV_SYSTEM_PROCESSOR}")

diff --git a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake
@@ -39,9 +39,9 @@ ELSE (WIN32)
 ENDIF (WIN32)
 
 IF (GLEW_INCLUDE_PATH)
-  SET( GLEW_FOUND 1 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
+	SET( GLEW_FOUND 1 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
 ELSE (GLEW_INCLUDE_PATH)
-  SET( GLEW_FOUND 0 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
+	SET( GLEW_FOUND 0 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
 ENDIF (GLEW_INCLUDE_PATH)
 
 MARK_AS_ADVANCED( GLEW_FOUND )
diff --git a/cmake/OptimalOptions.cmake b/cmake/OptimalOptions.cmake
@@ -28,4 +28,19 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
-
+IF(MSVC)
+	# @@ Some of these might only be available in VC8.
+	# Code generation flags.
+#	SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:SSE2 /fp:fast")
+#	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:SSE2 /fp:fast")
+
+	# Optimization flags.
+	SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} /O2 /Ob2 /Oi /Ot /Oy /GL")
+	SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} /O2 /Ob2 /Oi /Ot /Oy /GL")
+	SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
+	SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG")
+	SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} /LTCG")
+
+	# Definitions.
+	ADD_DEFINITIONS(-D__SSE2__ -D__SSE__ -D__MMX__)
+ENDIF(MSVC)