* Sync the recent cmake branch changes.

[reactos.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 90a8e28..d1f8eb3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,11 @@
 
 cmake_minimum_required(VERSION 2.6)
+
+if(POLICY CMP0017)
+    # Shadow cmake provided modules
+    cmake_policy(SET CMP0017 OLD)
+endif()
+
 project(REACTOS)
 
 #versioning
@@ -7,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)
@@ -14,7 +21,7 @@ set(CMAKE_SHARED_LIBRARY_PREFIX "")
 set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE)
 set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE)
 set(CMAKE_COLOR_MAKEFILE OFF)
-set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
+#set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
 
 if(NOT ARCH)
     set(ARCH i386)
@@ -52,7 +59,7 @@ if(NOT CMAKE_CROSSCOMPILING)
     add_subdirectory(lib)
 
     if(NOT MSVC)
-        export(TARGETS widl gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+        export(TARGETS widl wrc gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
     else()
         export(TARGETS gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
     endif()
@@ -63,8 +70,11 @@ else()
     # 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)
+    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
@@ -96,10 +106,6 @@ else()
     # IDL macros for widl/midl
     include(cmake/idl-support.cmake)
 
-    #Some useful variables
-    set(LIVECD_DIR "${REACTOS_BINARY_DIR}/boot/livecd")
-    set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd")
-
     # Activate support for assembly source files
     enable_language(ASM)
 
@@ -179,8 +185,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)
@@ -192,27 +199,8 @@ else()
 
     file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos)
 
-    add_custom_target(buildno_header ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/buildno.h)
-
-    file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib)
-
-    list(APPEND OUTPUT_FILES
-        ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib8gen.c
-        ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib16gen.c
-        ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib32gen.c)
-
-    add_custom_command(
-        OUTPUT ${OUTPUT_FILES}
-        COMMAND native-gendib ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib
-        DEPENDS native-gendib)
-
-    add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES})
-
     file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
 
-    #bootcd and livecd
-    include(ros_cd.cmake)
-
     add_dependency_footer()
 
 endif()