Author: akhaldi Date: Wed Jul 28 12:58:37 2010 New Revision: 48329
URL: http://svn.reactos.org/svn/reactos?rev=48329&view=rev Log: [CMAKE] - We won't be using mkdir to create folders since cmake has a command for it. - Split nci generated files into separate targets, so that modules can depend on each one of them separately if needed. - Add win32ksys to build.
Added: branches/cmake-bringup/lib/win32ksys/CMakeLists.txt (with props) Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/lib/CMakeLists.txt branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt branches/cmake-bringup/toolchain-mingw32.cmake
Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?rev... ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Wed Jul 28 12:58:37 2010 @@ -83,19 +83,15 @@
# stupid nci tool can't create folders itself, se we're gonna create them for it set(nci_folders - dll\ntdll\def - lib\ntdllsys\ntdll - lib\win32ksys - ntoskrnl\include\internal - ntoskrnl\ex - subsystems\win32\win32k\include + ${CMAKE_CURRENT_BINARY_DIR}/dll/ntdll/def + ${CMAKE_CURRENT_BINARY_DIR}/lib/ntdllsys/ntdll + ${CMAKE_CURRENT_BINARY_DIR}/lib/win32ksys + ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl/include/internal + ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl/ex + ${CMAKE_CURRENT_BINARY_DIR}/subsystems/win32/win32k/include )
-ADD_CUSTOM_COMMAND( - OUTPUT ${nci_folders} - COMMAND mkdir ${MKDIR_ARG} ${nci_folders} - WORKING_DIRECTORY ${REACTOS_BINARY_DIR} -) +file(MAKE_DIRECTORY ${nci_folders})
ADD_CUSTOM_COMMAND( OUTPUT ${nci_output} @@ -105,7 +101,8 @@
SET_SOURCE_FILES_PROPERTIES(${nci_output} PROPERTIES GENERATED TRUE)
-ADD_CUSTOM_TARGET(nci_resources ALL DEPENDS ${nci_output}) +ADD_CUSTOM_TARGET(ntdll_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) +ADD_CUSTOM_TARGET(win32k_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S)
endif()
Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.txt... ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Wed Jul 28 12:58:37 2010 @@ -21,6 +21,7 @@ add_subdirectory(sdk) add_subdirectory(smlib) add_subdirectory(tdilib) +add_subdirectory(win32ksys)
else()
Modified: branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/ntdllsys/CMake... ============================================================================== --- branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/ntdllsys/CMakeLists.txt [iso-8859-1] Wed Jul 28 12:58:37 2010 @@ -10,4 +10,4 @@ set_source_files_properties(${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S PROPERTIES GENERATED TRUE)
add_library(ntdllsys ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) -add_dependencies(ntdllsys nci_resources) +add_dependencies(ntdllsys ntdllsys_S)
Added: branches/cmake-bringup/lib/win32ksys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/win32ksys/CMak... ============================================================================== --- branches/cmake-bringup/lib/win32ksys/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/win32ksys/CMakeLists.txt [iso-8859-1] Wed Jul 28 12:58:37 2010 @@ -1,0 +1,13 @@ + +get_directory_property(defines COMPILE_DEFINITIONS) + +foreach(arg ${defines}) + set(result_defs "${result_defs} -D${arg}") +endforeach(arg ${defines}) + +set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> ${result_defs} -D__ASM__ <FLAGS> -c <SOURCE>") + +set_source_files_properties(${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S PROPERTIES GENERATED TRUE) + +add_library(win32ksys ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) +add_dependencies(win32ksys win32k_S)
Propchange: branches/cmake-bringup/lib/win32ksys/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32.... ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Wed Jul 28 12:58:37 2010 @@ -4,10 +4,8 @@ # Choose the right MinGW prefix if (CMAKE_HOST_SYSTEM_NAME MATCHES Windows) set(MINGW_PREFIX "") -set(MKDIR_ARG "") else() set(MINGW_PREFIX "mingw32-") -set(MKDIR_ARG "-p") endif()
# the name of the target operating system