[CMAKE]

[reactos.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5b3046..29af31f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,31 +40,47 @@ add_subdirectory(tools)
 add_subdirectory(lib)
 
 if(NOT MSVC)
-export(TARGETS widl winebuild nci buildno gendib cdmake FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+export(TARGETS widl winebuild nci buildno gendib cabman cdmake mkhive FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
 else()
-export(TARGETS winebuild nci buildno gendib cdmake FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+export(TARGETS winebuild nci buildno gendib cabman cdmake mkhive FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
 endif()
 
 else()
 
+#Some cleanup
+file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt)
+file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt)
+file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt)
+file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt)
+file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_cab.txt)
+file(REMOVE ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt)
+
+#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)
 
 # Activate language support for resource files
 enable_language(RC)
 
-set(IMPORT_EXECUTABLES "${REACTOS_SOURCE_DIR}/build/ImportExecutables.cmake" CACHE FILEPATH "Host executables")
+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 MATCHES 1)
+if(DBG)
 add_definitions(-D_SEH_ENABLE_TRACE)
-endif(DBG MATCHES 1)
+endif(DBG)
 
-if((DBG MATCHES 1) OR (KDBG MATCHES 1))
+if(DBG OR KDBG)
 set(DBG_OR_KDBG true)
-endif((DBG MATCHES 1) OR (KDBG MATCHES 1))
+endif(DBG OR KDBG)
 
 # Version Options
 add_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502 -D_WIN32_WINDOWS=0x502 -D_SETUPAPI_VER=0x502)
@@ -97,22 +113,10 @@ include_directories(include/reactos/libs)
 add_subdirectory(include/psdk)
 add_subdirectory(include/dxsdk)
 add_subdirectory(include/reactos/idl)
+add_subdirectory(include/reactos/wine)
 add_subdirectory(include/reactos/mc)
 
-#minicd target
-set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd")
-
-file(MAKE_DIRECTORY "${BOOTCD_DIR}")
-file(MAKE_DIRECTORY "${BOOTCD_DIR}/loader")
-file(MAKE_DIRECTORY "${BOOTCD_DIR}/reactos")
-file(MAKE_DIRECTORY "${BOOTCD_DIR}/reactos/system32")
-
-add_custom_command(
-    OUTPUT ${REACTOS_BINARY_DIR}/minicd.iso
-    COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${BOOTCD_DIR} REACTOS ${REACTOS_BINARY_DIR}/minicd.iso
-    DEPENDS native-cdmake)
-add_custom_target(minicd DEPENDS ${REACTOS_BINARY_DIR}/minicd.iso)
-add_minicd(${REACTOS_SOURCE_DIR}/boot/bootdata/bootcd.ini "" freeldr.ini)
+include(baseaddress.cmake)
 
 add_subdirectory(base)
 add_subdirectory(boot)
@@ -181,5 +185,8 @@ add_custom_command(
 
 add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES})
 
+#bootcd and livecd
+include(ros_cd.cmake)
+
 endif()