[BOOTDATA-CMAKE]

[reactos.git] / reactos / cmake / CMakeMacros.cmake

diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake
index ea60b23..34aeebd 100644 (file)
--- a/reactos/cmake/CMakeMacros.cmake
+++ b/reactos/cmake/CMakeMacros.cmake
@@ -2,10 +2,7 @@
 macro(set_cpp)
     set(IS_CPP 1)
     if(MSVC)
-        include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport)
-        add_definitions(
-            -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++
-            -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt)
+        include_directories(${REACTOS_SOURCE_DIR}/include/c++)
     endif()
 endmacro()
 
@@ -100,18 +97,20 @@ macro(dir_to_num dir var)
         set(${var} 6)
     elseif(${dir} STREQUAL reactos/bin)
         set(${var} 7)
-    elseif(${dir} STREQUAL reactos/media)
+    elseif(${dir} STREQUAL reactos/bin/data)
         set(${var} 8)
-    elseif(${dir} STREQUAL reactos/Microsoft.NET)
+    elseif(${dir} STREQUAL reactos/media)
         set(${var} 9)
-    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET)
         set(${var} 10)
-    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.0.3705)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework)
         set(${var} 11)
-    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.1.4322)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.0.3705)
         set(${var} 12)
-    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.1.4322)
         set(${var} 13)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727)
+        set(${var} 14)
     else()
         message(ERROR "Wrong destination: ${dir}")
     endif()
@@ -250,7 +249,7 @@ if(NOT MSVC_IDE)
     endfunction()
 endif()
 
-if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
     macro(to_win_path _cmake_path _native_path)
         string(REPLACE "/" "\\" ${_native_path} "${_cmake_path}")
     endmacro()