[CMAKE]

[reactos.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0746eda..b62f464 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 cmake_minimum_required(VERSION 2.6)
 
-if(${CMAKE_VERSION} VERSION_GREATER "2.8.3")
+if(POLICY CMP0017)
     # Shadow cmake provided modules
     cmake_policy(SET CMP0017 OLD)
 endif()
@@ -13,6 +13,7 @@ include(include/reactos/version.cmake)
 
 # Don't escape preprocessor definition values added via add_definitions
 cmake_policy(SET CMP0005 OLD)
+cmake_policy(SET CMP0002 NEW)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
@@ -71,6 +72,9 @@ else()
     set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
     set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
     set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
+    
+    #useful stuff!
+    include(CMakeParseArguments)
 
     # Do some cleanup
     file(REMOVE
@@ -185,8 +189,9 @@ else()
 
     include(baseaddress.cmake)
 
-    add_subdirectory(base)
+    #begin with boot so reactos_cab target is defined before all other modules
     add_subdirectory(boot)
+    add_subdirectory(base)
     add_subdirectory(dll)
     add_subdirectory(drivers)
     add_subdirectory(hal)
@@ -200,9 +205,6 @@ else()
 
     file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
 
-    #bootcd and livecd
-    include(ros_cd.cmake)
-
     add_dependency_footer()
 
 endif()