[NTOSKRNL]

[reactos.git] / reactos / CMakeLists.txt

diff --git a/reactos/CMakeLists.txt b/reactos/CMakeLists.txt
index dea6232..5864b5c 100644 (file)
--- a/reactos/CMakeLists.txt
+++ b/reactos/CMakeLists.txt
@@ -19,7 +19,7 @@ endif()
 project(REACTOS)
 
 # Versioning
-include(include/reactos/version.cmake)
+include(sdk/include/reactos/version.cmake)
 
 # Don't escape preprocessor definition values added via add_definitions
 cmake_policy(SET CMP0005 OLD)
@@ -37,12 +37,8 @@ set(CMAKE_COLOR_MAKEFILE OFF)
 #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
 set(CMAKE_SKIP_INSTALL_RULES ON)
 
-if(NOT CMAKE_VERSION STREQUAL "2.8.12.1-ReactOS")
-    set(CMAKE_DISABLE_NINJA_DEPSLOG TRUE)
-endif()
-
 if(NOT DEFINED NEW_STYLE_BUILD)
-    set(NEW_STYLE_BUILD FALSE)
+    set(NEW_STYLE_BUILD TRUE)
 endif()
 
 if(NOT ARCH)
@@ -57,15 +53,15 @@ string(TOLOWER ${ARCH} ARCH)
 
 # 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__)
 
@@ -80,7 +76,7 @@ if(NOT MSVC_IDE)
 endif()
 
 # Bison and Flex support
-# include(cmake/bison-flex.cmake)
+# include(sdk/cmake/bison-flex.cmake)
 
 if(NOT CMAKE_CROSSCOMPILING)
 
@@ -102,13 +98,13 @@ if(NOT CMAKE_CROSSCOMPILING)
         add_compile_flags("-fshort-wchar -Wno-multichar")
     endif()
 
-    include_directories(include/host)
+    include_directories(sdk/include/host)
 
     if(NOT MSVC)
         add_subdirectory(dll/win32/dbghelp)
     endif()
-    add_subdirectory(tools)
-    add_subdirectory(lib)
+    add_subdirectory(sdk/tools)
+    add_subdirectory(sdk/lib)
 
     if(NOT NEW_STYLE_BUILD)
         if(NOT MSVC)
@@ -121,9 +117,12 @@ if(NOT CMAKE_CROSSCOMPILING)
 else()
 
     if(NEW_STYLE_BUILD)
-        include(cmake/host-tools.cmake)
+        include(sdk/cmake/host-tools.cmake)
     endif()
 
+    # Print build type
+    message("-- Build Type: ${CMAKE_BUILD_TYPE}")
+
     # adjust the default behaviour of the FIND_XXX() commands:
     # search headers and libraries in the target environment, search
     # programs in the host environment
@@ -208,59 +207,59 @@ else()
     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)
+        include(sdk/cmake/msvc.cmake)
     else()
-        include(cmake/gcc.cmake)
+        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(
-        include
-        include/psdk
-        include/dxsdk
-        ${REACTOS_BINARY_DIR}/include
-        ${REACTOS_BINARY_DIR}/include/psdk
-        ${REACTOS_BINARY_DIR}/include/dxsdk
-        ${REACTOS_BINARY_DIR}/include/ddk
-        ${REACTOS_BINARY_DIR}/include/reactos
-        include/crt
-        include/ddk
-        include/ndk
-        include/reactos
-        include/reactos/libs)
+        sdk/include
+        sdk/include/psdk
+        sdk/include/dxsdk
+        ${REACTOS_BINARY_DIR}/sdk/include
+        ${REACTOS_BINARY_DIR}/sdk/include/psdk
+        ${REACTOS_BINARY_DIR}/sdk/include/dxsdk
+        ${REACTOS_BINARY_DIR}/sdk/include/ddk
+        ${REACTOS_BINARY_DIR}/sdk/include/reactos
+        sdk/include/crt
+        sdk/include/ddk
+        sdk/include/ndk
+        sdk/include/reactos
+        sdk/include/reactos/libs)
 
     if(ARCH STREQUAL "arm")
-        include_directories(${REACTOS_SOURCE_DIR}/include/reactos/arm)
+        include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/arm)
     endif()
 
     add_dependency_header()
 
-    add_subdirectory(include/xdk)
-    add_subdirectory(include/psdk)
-    add_subdirectory(include/dxsdk)
-    add_subdirectory(include/reactos/wine)
-    add_subdirectory(include/reactos/mc)
-    add_subdirectory(include/asm)
+    add_subdirectory(sdk/include/xdk)
+    add_subdirectory(sdk/include/psdk)
+    add_subdirectory(sdk/include/dxsdk)
+    add_subdirectory(sdk/include/reactos/wine)
+    add_subdirectory(sdk/include/reactos/mc)
+    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)
+        include(sdk/cmake/baseaddress_msvc.cmake)
     else()
-        include(cmake/baseaddress.cmake)
+        include(sdk/cmake/baseaddress.cmake)
     endif()
 
     # For MSVC builds, this puts all debug symbols file in the same directory.
@@ -272,12 +271,12 @@ else()
     add_subdirectory(dll)
     add_subdirectory(drivers)
     add_subdirectory(hal)
-    add_subdirectory(lib)
+    add_subdirectory(sdk/lib)
     add_subdirectory(media)
     add_subdirectory(modules)
     add_subdirectory(ntoskrnl)
     add_subdirectory(subsystems)
-    add_subdirectory(tools/wpp)
+    add_subdirectory(sdk/tools/wpp)
     add_subdirectory(win32ss)
 
     # Create the registry hives
@@ -286,7 +285,7 @@ else()
     # Create {bootcd, livecd, bootcdregtest}.lst
     create_iso_lists()
 
-    file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos)
+    file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/sdk/include/reactos)
 
     add_dependency_footer()
 endif()