Browse Source

Merge pull request #666 from tdev/cmake_linux_fixes

CMake linux fixes
Thomas Fischer 11 years ago
parent
commit
5e50d72678
1 changed files with 7 additions and 7 deletions
  1. 7 7
      Tools/CMake/torque3d.cmake

+ 7 - 7
Tools/CMake/torque3d.cmake

@@ -84,14 +84,14 @@ mark_as_advanced(TORQUE_DEBUG_GFX_MODE)
 #option(DEBUG_SPEW "more debug" OFF)
 #option(DEBUG_SPEW "more debug" OFF)
 set(TORQUE_NO_DSO_GENERATION ON)
 set(TORQUE_NO_DSO_GENERATION ON)
 
 
-# warning C4800: 'XXX' : forcing value to bool 'true' or 'false' (performance warning)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4800")
-# warning C4018: '<' : signed/unsigned mismatch
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4018")
-# warning C4244: 'initializing' : conversion from 'XXX' to 'XXX', possible loss of data
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4244")
-
 if(WIN32)
 if(WIN32)
+    # warning C4800: 'XXX' : forcing value to bool 'true' or 'false' (performance warning)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4800")
+    # warning C4018: '<' : signed/unsigned mismatch
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4018")
+    # warning C4244: 'initializing' : conversion from 'XXX' to 'XXX', possible loss of data
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -wd4244")
+
     link_directories($ENV{DXSDK_DIR}/Lib/x86)
     link_directories($ENV{DXSDK_DIR}/Lib/x86)
 endif()
 endif()