[CMAKE]

[reactos.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8eed280..3676fea 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,45 @@
+
 cmake_minimum_required(VERSION 2.8)
 project(REACTOS)
 
 # Compile options
 include(config.cmake)
 
+if(NOT CMAKE_CROSSCOMPILING)
+
+add_definitions(-DTARGET_i386)
+if(MSVC)
+add_definitions(-Dinline=__inline)
+endif()
+
+include_directories(
+    ${REACTOS_SOURCE_DIR}/tools/unicode
+    include
+    include/host
+    include/reactos
+    include/reactos/wine
+    ${REACTOS_BINARY_DIR}/include)
+
+add_subdirectory(tools)
+add_subdirectory(lib)
+
+if(NOT MSVC)
+export(TARGETS widl nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+else()
+export(TARGETS nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+endif()
+
+else()
+
+if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR)
+    set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build)
+endif()
+
+set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables")
+include(${IMPORT_EXECUTABLES})
+
+endif(NOT CMAKE_CROSSCOMPILING)
+
 # Compiler specific definitions and macros
 if(MSVC)
 include(msc.cmake)
@@ -21,32 +57,13 @@ 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)
 
 add_definitions(-D__REACTOS__)
 
-if(NOT CMAKE_CROSSCOMPILING)
-
-add_definitions(-DTARGET_i386)
-
-include_directories(
-    ${REACTOS_SOURCE_DIR}/tools/unicode
-    include
-    include/host
-    include/reactos
-    include/reactos/wine
-    ${REACTOS_BINARY_DIR}/include)
-
-add_subdirectory(tools)
-add_subdirectory(lib)
-
-if(NOT MSVC)
-export(TARGETS widl winebuild nci buildno gendib cabman cdmake mkhive spec2pdef FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
-else()
-export(TARGETS winebuild nci buildno gendib cabman cdmake mkhive spec2pdef FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
-endif()
-
-else()
+if(CMAKE_CROSSCOMPILING)
 
 #Some cleanup
 file(REMOVE
@@ -67,13 +84,6 @@ enable_language(ASM)
 # Activate language support for resource files
 enable_language(RC)
 
-if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR)
-    set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build)
-endif()
-
-set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables")
-include(${IMPORT_EXECUTABLES})
-
 add_definitions(-DDBG=${DBG} -DKDBG=${KDBG})
 
 if(DBG)
@@ -118,6 +128,7 @@ add_subdirectory(include/dxsdk)
 add_subdirectory(include/reactos/idl)
 add_subdirectory(include/reactos/wine)
 add_subdirectory(include/reactos/mc)
+add_subdirectory(include/asm)
 
 include(baseaddress.cmake)
 
@@ -188,6 +199,8 @@ add_custom_command(
 
 add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES})
 
+file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
+
 #bootcd and livecd
 include(ros_cd.cmake)