From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 14 Feb 2011 10:32:46 +0000 (+0000)
Subject: [CMAKE]
X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~103
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=3f7f1e0d7fa083072fbb6a97a596be58e52897cd

[CMAKE]
- Get rid of the redundancy in setting msvc flags, and set /ZI instead of /Zi for both host and target modules.
- Get rid of the redundancy in setting the default behaviour of the FIND_XXX() commands between toolchain files.

svn path=/branches/cmake-bringup/; revision=50688
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d04a92c912c..01a108a2592 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,13 @@ if(NOT CMAKE_CROSSCOMPILING)
 
 else()
 
+    # adjust the default behaviour of the FIND_XXX() commands:
+    # search headers and libraries in the target environment, search
+    # programs in the host environment
+    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+    set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
     # Do some cleanup
     file(REMOVE
         ${REACTOS_BINARY_DIR}/dependencies.graphml
diff --git a/cmake/Platform/Windows-cl.cmake b/cmake/Platform/Windows-cl.cmake
index 0761306d125..a14ee48ed12 100644
--- a/cmake/Platform/Windows-cl.cmake
+++ b/cmake/Platform/Windows-cl.cmake
@@ -194,7 +194,7 @@ IF("${MSVC_VERSION}" GREATER 1599)
 ENDIF()
 
 # default to Debug builds
-IF(MSVC_VERSION GREATER 1310)
+if(MSVC_VERSION GREATER 1310)
   # for 2005 make sure the manifest is put in the dll with mt
 #  SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_LIBRARY}")
 #  SET(CMAKE_CXX_CREATE_SHARED_MODULE "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_MODULE}")
@@ -205,15 +205,15 @@ IF(MSVC_VERSION GREATER 1310)
 #  SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_CXX_LINK_EXECUTABLE}")
 #  SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}")
 
-  SET(CMAKE_BUILD_TYPE_INIT Debug)
+    set(CMAKE_BUILD_TYPE_INIT Debug)
 
-  IF(ENV{DDKBUILDENV} OR NOT CMAKE_CROSSCOMPILING)
-    SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od")
-    SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi  /Ob0 /Od")
-  ELSE()
-    SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od")
-    SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi  /Ob0 /Od")
-  ENDIF()
+    if(ENV{DDKBUILDENV} OR NOT CMAKE_CROSSCOMPILING)
+        set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /ZI /Ob0 /Od")
+        set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od")
+    else()
+        set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od")
+        set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od")
+    endif()
 
   SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc")
   SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG")
diff --git a/msc.cmake b/msc.cmake
index 95dae3498ce..b0c37502722 100644
--- a/msc.cmake
+++ b/msc.cmake
@@ -13,7 +13,7 @@ elseif(OPTIMIZE STREQUAL "5")
 endif()
 endif()
 
-add_definitions(/X /GR- /GS- /Zl /Zi)
+add_definitions(/X /GR- /GS- /Zl)
 add_definitions(-Dinline=__inline -D__STDC__=1)
 
 if(${_MACHINE_ARCH_FLAG} MATCHES X86)
@@ -130,9 +130,6 @@ macro(set_unicode)
    set(IS_UNICODE 1)
 endmacro()
 
-set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi  /Ob0 /Od")
-set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")
-
 macro(set_rc_compiler)
 # dummy, this workaround is only needed in mingw due to lack of RC support in cmake
 endmacro()
diff --git a/toolchain-mingw32.cmake b/toolchain-mingw32.cmake
index b263d2d09dd..a6bae6c2fc9 100644
--- a/toolchain-mingw32.cmake
+++ b/toolchain-mingw32.cmake
@@ -48,10 +48,3 @@ if(ARCH MATCHES i386)
 elseif(ARCH MATCHES amd64)
     set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import")
 endif()
-
-# adjust the default behaviour of the FIND_XXX() commands:
-# search headers and libraries in the target environment, search
-# programs in the host environment
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake
index 6c781b45f7c..6687fba71ba 100644
--- a/toolchain-msvc.cmake
+++ b/toolchain-msvc.cmake
@@ -20,12 +20,6 @@ set(CMAKE_ASM_COMPILE_OBJECT
     "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp")
 
 set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000")
-set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi  /Ob0 /Od")
-set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
 set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "")