[LT2013]

[reactos.git] / cmake / CMakeMacros.cmake

diff --git a/cmake/CMakeMacros.cmake b/cmake/CMakeMacros.cmake
index 325e88f..8091cc7 100644 (file)
--- a/cmake/CMakeMacros.cmake
+++ b/cmake/CMakeMacros.cmake
@@ -2,10 +2,7 @@
 macro(set_cpp)
     set(IS_CPP 1)
     if(MSVC)
-        include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport)
-        add_definitions(
-            -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++
-            -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt)
+        include_directories(${REACTOS_SOURCE_DIR}/include/c++)
     endif()
 endmacro()
 
@@ -100,8 +97,24 @@ macro(dir_to_num dir var)
         set(${var} 6)
     elseif(${dir} STREQUAL reactos/bin)
         set(${var} 7)
-    elseif(${dir} STREQUAL reactos/media)
+    elseif(${dir} STREQUAL reactos/bin/data)
         set(${var} 8)
+    elseif(${dir} STREQUAL reactos/media)
+        set(${var} 9)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET)
+        set(${var} 10)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework)
+        set(${var} 11)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.0.3705)
+        set(${var} 12)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.1.4322)
+        set(${var} 13)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727)
+        set(${var} 14)
+    elseif(${dir} STREQUAL reactos/Resources)
+        set(${var} 15)
+    elseif(${dir} STREQUAL reactos/Resources/Themes)
+        set(${var} 16)
     else()
         message(ERROR "Wrong destination: ${dir}")
     endif()
@@ -125,7 +138,7 @@ function(add_cd_file)
 
     #get file if we need to
     if(NOT _CD_FILE)
-        get_target_property(_CD_FILE ${_CD_TARGET} LOCATION)
+        get_target_property(_CD_FILE ${_CD_TARGET} LOCATION_${CMAKE_BUILD_TYPE})
     endif()
 
     #do we add it to all CDs?
@@ -154,11 +167,9 @@ function(add_cd_file)
         else()
             #add it in reactos.cab
             dir_to_num(${_CD_DESTINATION} _num)
-            if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
-                file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "${_CD_FILE} ${_num}\n")
-            else()
-                file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "\"${_CD_FILE}\" ${_num}\n")
-            endif()
+            file(RELATIVE_PATH __relative_file ${REACTOS_SOURCE_DIR} ${_CD_FILE})
+            file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "\"${__relative_file}\" ${_num}\n")
+            unset(__relative_file)
             if(_CD_TARGET)
                 #manage dependency
                 add_dependencies(reactos_cab ${_CD_TARGET})
@@ -214,16 +225,20 @@ function(add_cd_file)
 endfunction()
 
 # Create module_clean targets
-function(add_clean_target target)
-    if(CMAKE_GENERATOR MATCHES "Unix Makefiles" OR CMAKE_GENERATOR MATCHES "MinGW Makefiles")
-        set(CLEAN_COMMAND make clean)
-    elseif(CMAKE_GENERATOR MATCHES "NMake Makefiles")
-        set(CLEAN_COMMAND nmake /nologo clean)
+function(add_clean_target _target)
+    set(_clean_working_directory ${CMAKE_CURRENT_BINARY_DIR})
+    if(CMAKE_GENERATOR STREQUAL "Unix Makefiles" OR CMAKE_GENERATOR STREQUAL "MinGW Makefiles")
+        set(_clean_command make clean)
+    elseif(CMAKE_GENERATOR STREQUAL "NMake Makefiles")
+        set(_clean_command nmake /nologo clean)
+    elseif(CMAKE_GENERATOR STREQUAL "Ninja")
+        set(_clean_command ninja -t clean ${_target})
+        set(_clean_working_directory ${REACTOS_BINARY_DIR})
     endif()
-    add_custom_target(${target}_clean
-        COMMAND ${CLEAN_COMMAND}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMENT "Cleaning ${target}")
+    add_custom_target(${_target}_clean
+        COMMAND ${_clean_command}
+        WORKING_DIRECTORY ${_clean_working_directory}
+        COMMENT "Cleaning ${_target}")
 endfunction()
 
 if(NOT MSVC_IDE)
@@ -238,7 +253,7 @@ if(NOT MSVC_IDE)
     endfunction()
 endif()
 
-if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
+if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
     macro(to_win_path _cmake_path _native_path)
         string(REPLACE "/" "\\" ${_native_path} "${_cmake_path}")
     endmacro()
@@ -273,7 +288,7 @@ function(add_importlibs _module)
             add_target_compile_definitions(${_module} _DLL __USE_CRTIMP)
             target_link_libraries(${_module} msvcrtex)
         endif()
-        target_link_libraries(${_module} ${CMAKE_BINARY_DIR}/importlibs/lib${LIB}${CMAKE_STATIC_LIBRARY_SUFFIX})
+        target_link_libraries(${_module} lib${LIB})
         add_dependencies(${_module} lib${LIB})
         add_dependency_edge(${_module} ${LIB})
     endforeach()
@@ -294,7 +309,8 @@ function(set_module_type MODULE TYPE)
         set(__subsystem console)
     elseif(${TYPE} STREQUAL win32gui)
         set(__subsystem windows)
-    elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx) OR (${TYPE} STREQUAL cpl)))
+    elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx)
+            OR (${TYPE} STREQUAL cpl) OR (${TYPE} STREQUAL module)))
         message(FATAL_ERROR "Unknown type ${TYPE} for module ${MODULE}")
     endif()
 
@@ -336,6 +352,8 @@ function(set_module_type MODULE TYPE)
     elseif(${TYPE} STREQUAL nativedll)
         set(__entrypoint DllMain)
         set(__entrystack 12)
+    elseif(${TYPE} STREQUAL module)
+        set(__entrypoint 0)
     endif()
 
     if(DEFINED __entrypoint)
@@ -376,3 +394,35 @@ function(set_module_type MODULE TYPE)
     # do compiler specific stuff
     set_module_type_toolchain(${MODULE} ${TYPE})
 endfunction()
+
+function(preprocess_file __in __out)
+    set(__arg ${__in})
+    foreach(__def in ${ARGN})
+        list(APPEND __arg -D${__def})
+    endforeach()
+    if(MSVC)
+        add_custom_command(OUTPUT ${_out}
+            COMMAND ${CMAKE_C_COMPILER} /EP ${__arg}
+            DEPENDS ${__in})
+    else()
+        add_custom_command(OUTPUT ${_out}
+            COMMAND ${CMAKE_C_COMPILER} -E ${__arg}
+            DEPENDS ${__in})
+    endif()
+endfunction()
+
+function(get_includes OUTPUT_VAR)
+    get_directory_property(_includes INCLUDE_DIRECTORIES)
+    foreach(arg ${_includes})
+        list(APPEND __tmp_var -I${arg})
+    endforeach()
+    set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE)
+endfunction()
+
+function(get_defines OUTPUT_VAR)
+    get_directory_property(_defines COMPILE_DEFINITIONS)
+    foreach(arg ${_defines})
+        list(APPEND __tmp_var -D${arg})
+    endforeach()
+    set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE)
+endfunction()