[ros-diffs] [akhaldi] 71361: [SDK][CMAKE] The CMake folder is part of our SDK. CORE-9111

[akhaldi]

Author: akhaldi
Date: Fri May 20 16:06:48 2016
New Revision: 71361

URL: http://svn.reactos.org/svn/reactos?rev=71361&view=rev
Log:
[SDK][CMAKE] The CMake folder is part of our SDK. CORE-9111

Added:
    trunk/reactos/sdk/cmake/
      - copied from r71360, trunk/reactos/cmake/
Removed:
    trunk/reactos/cmake/
Modified:
    trunk/reactos/CMakeLists.txt
    trunk/reactos/PreLoad.cmake

Modified: trunk/reactos/CMakeLists.txt
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=71361&r1=71360&r2=71361&view=diff
==============================================================================
--- trunk/reactos/CMakeLists.txt        [iso-8859-1] (original)
+++ trunk/reactos/CMakeLists.txt        [iso-8859-1] Fri May 20 16:06:48 2016
@@ -53,15 +53,15 @@
 
 # Compile options
 if(ARCH STREQUAL "i386")
-    include(cmake/config.cmake)
+    include(sdk/cmake/config.cmake)
 elseif(ARCH STREQUAL "amd64")
-    include(cmake/config-amd64.cmake)
+    include(sdk/cmake/config-amd64.cmake)
 elseif(ARCH STREQUAL "arm")
-    include(cmake/config-arm.cmake)
+    include(sdk/cmake/config-arm.cmake)
 endif()
 
 # Compiler flags handling
-include(cmake/compilerflags.cmake)
+include(sdk/cmake/compilerflags.cmake)
 
 add_definitions(-D__REACTOS__)
 
@@ -76,7 +76,7 @@
 endif()
 
 # Bison and Flex support
-# include(cmake/bison-flex.cmake)
+# include(sdk/cmake/bison-flex.cmake)
 
 if(NOT CMAKE_CROSSCOMPILING)
 
@@ -117,7 +117,7 @@
 else()
 
     if(NEW_STYLE_BUILD)
-        include(cmake/host-tools.cmake)
+        include(sdk/cmake/host-tools.cmake)
     endif()
 
     # Print build type
@@ -207,24 +207,24 @@
     enable_language(RC)
 
     # Localization definitions
-    include(cmake/localization.cmake)
+    include(sdk/cmake/localization.cmake)
     set(I18N_DEFS "")
     # This will set I18N_DEFS for later use
     set_i18n_language(${I18N_LANG})
 
     # Compiler specific definitions and macros
     if(MSVC)
-        include(cmake/msvc.cmake)
-    else()
-        include(cmake/gcc.cmake)
+        include(sdk/cmake/msvc.cmake)
+    else()
+        include(sdk/cmake/gcc.cmake)
     endif()
 
     # Generic macros
-    include(cmake/CMakeMacros.cmake)
+    include(sdk/cmake/CMakeMacros.cmake)
 
     # IDL macros for widl/midl
     # We're using widl now for both MSVC and GCC builds
-    include(cmake/widl-support.cmake)
+    include(sdk/cmake/widl-support.cmake)
 
     include_directories(
         sdk/include
@@ -255,11 +255,11 @@
     add_subdirectory(sdk/include/asm)
 
     if(NO_ROSSYM)
-        include(cmake/baseaddress_dwarf.cmake)
+        include(sdk/cmake/baseaddress_dwarf.cmake)
     elseif(MSVC)
-        include(cmake/baseaddress_msvc.cmake)
-    else()
-        include(cmake/baseaddress.cmake)
+        include(sdk/cmake/baseaddress_msvc.cmake)
+    else()
+        include(sdk/cmake/baseaddress.cmake)
     endif()
 
     # For MSVC builds, this puts all debug symbols file in the same directory.

Modified: trunk/reactos/PreLoad.cmake
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/PreLoad.cmake?rev=71361&r1=71360&r2=71361&view=diff
==============================================================================
--- trunk/reactos/PreLoad.cmake [iso-8859-1] (original)
+++ trunk/reactos/PreLoad.cmake [iso-8859-1] Fri May 20 16:06:48 2016
@@ -4,7 +4,7 @@
 
 #message("/PreLoad.cmake ... ${REACTOS_HOME_DIR}")
 
-SET(CMAKE_MODULE_PATH "${REACTOS_HOME_DIR}/cmake" CACHE INTERNAL "")
+SET(CMAKE_MODULE_PATH "${REACTOS_HOME_DIR}/sdk/cmake" CACHE INTERNAL "")
 
 #message("CMAKE_MODULE_PATH = ${CMAKE_MODULE_PATH}")