[CMAKE]

- Add support for gui configurable options
- globalize compiler specific cmake files
- Add compiler specific macros set_entrypoint, set_module_type

svn path=/branches/cmake-bringup/; revision=48821

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b47897f..6536f27 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,17 @@
 cmake_minimum_required(VERSION 2.8)
 project(REACTOS)
 
 cmake_minimum_required(VERSION 2.8)
 project(REACTOS)
 

+# Compile options
+include(config.cmake)
+
+# Compiler specific definitions and macros
+if(MSVC)
+include(msc.cmake)
+else()
+include(gcc.cmake)
+endif(MSVC)
+
+# Generic macros

 include(CMakeMacros.cmake)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 include(CMakeMacros.cmake)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)


@@ -15,7 +26,6 @@ add_definitions(-D__REACTOS__)
 if(NOT CMAKE_CROSSCOMPILING)
 
 add_definitions(-DTARGET_i386)
 if(NOT CMAKE_CROSSCOMPILING)
 
 add_definitions(-DTARGET_i386)

-add_definitions(-fshort-wchar)

 
 include_directories(${REACTOS_SOURCE_DIR}/tools/unicode)
 include_directories(include)
 
 include_directories(${REACTOS_SOURCE_DIR}/tools/unicode)
 include_directories(include)


@@ -27,15 +37,13 @@ include_directories(${REACTOS_BINARY_DIR}/include)
 add_subdirectory(tools)
 add_subdirectory(lib)
 
 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 cdmake FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )

-

 else()
 else()

+export(TARGETS winebuild nci buildno gendib cdmake FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+endif()

 
 

-if(MSVC)
-include(msc.cmake)

 else()
 else()

-include(gcc.cmake)
-endif(MSVC)

 
 # Activate support for assembly source files
 enable_language(ASM)
 
 # Activate support for assembly source files
 enable_language(ASM)


@@ -46,11 +54,6 @@ enable_language(RC)
 set(IMPORT_EXECUTABLES "${REACTOS_SOURCE_DIR}/build/ImportExecutables.cmake" CACHE FILEPATH "Host executables")
 include(${IMPORT_EXECUTABLES})
 
 set(IMPORT_EXECUTABLES "${REACTOS_SOURCE_DIR}/build/ImportExecutables.cmake" CACHE FILEPATH "Host executables")
 include(${IMPORT_EXECUTABLES})
 

-# Debug Options
-set(_WINKD_ 0)
-set(KDBG 1)
-set(DBG 1)
-

 add_definitions(-DDBG=${DBG} -DKDBG=${KDBG})
 
 if(DBG MATCHES 1)
 add_definitions(-DDBG=${DBG} -DKDBG=${KDBG})
 
 if(DBG MATCHES 1)


@@ -161,3 +164,4 @@ add_custom_command(
 add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES})
 
 endif()
 add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES})
 
 endif()

+

diff --git a/config.cmake b/config.cmake
new file mode 100644 (file)
index 0000000..a30d7ec
--- /dev/null
+++ b/config.cmake
@@ -0,0 +1,60 @@
+\r
+set(SARCH "pc" CACHE STRING\r
+"Sub-architecture to build for. Specify one of: xbox"\r
+)\r
+\r
+set(OARCH "pentium" CACHE STRING\r
+"Generate instructions for this CPU type. Specify one of:\r
+ native, i386, i486, pentium, pentium-mmx, pentiumpro, i686,\r
+ pentium2, pentium3, pentium-m, pentium4, prescott, nocona,\r
+ core2, k6, k6-2, athlon, athlon-xp, opteron, opteron-sse3,\r
+ barcelona, winchip-c6, winchip2, c3, c3-2, geode"\r
+)\r
+\r
+set(TUNE "i686" CACHE STRING\r
+"Which CPU ReactOS should be optimized for."\r
+)\r
+\r
+set (OPTIMIZE "1" CACHE STRING\r
+"What level of optimisation to use.\r
+  0 = off\r
+  1 = Default option, optimize for size (-Os) with some additional options\r
+  2 = -Os\r
+  3 = -O1\r
+  4 = -O2\r
+  5 = -O3"\r
+)\r
+\r
+set(DBG 1 CACHE BOOL\r
+"Whether to compile for debugging."\r
+)\r
+\r
+set(KDBG 1 CACHE BOOL\r
+"Whether to compile in the integrated kernel debugger."\r
+)\r
+\r
+set(GDB 0 CACHE BOOL\r
+"Whether to compile for debugging with GDB.\r
+If you don't use GDB, don't    enable this."\r
+)\r
+\r
+set(_WINKD_ 0 CACHE BOOL\r
+"Whether to compile with the KD protocol."\r
+)\r
+\r
+set(_ELF_ 0 CACHE BOOL\r
+"Whether to compile support for ELF files.\r
+Do not enable unless you know what you're doing."\r
+)\r
+\r
+set(NSWPAT 0 CACHE BOOL\r
+"Whether to compile apps/libs with features covered software patents or not.\r
+If you live in a country where software patents are valid/apply, don't\r
+enable this (except they/you purchased a license from the patent owner).\r
+This settings is disabled (0) by default."\r
+)\r
+\r
+set(BUILD_MP 1 CACHE BOOL\r
+"Whether to compile the multi processor versions for ntoskrnl and hal."\r
+)\r
+\r

diff --git a/gcc.cmake b/gcc.cmake
index d8d06f2..f760ac0 100644 (file)
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -1,25 +1,54 @@
-
-# Linking
-link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw)
-set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
-set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds")
-
-# Compiler Core
-add_definitions(-pipe -fms-extensions)
-
-set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-
-# Debugging (Note: DWARF-4 on 4.5.1 when we ship)
-add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types)
-
-# Tuning
-add_definitions(-march=pentium -mtune=i686)
-
-# Warnings
-add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value -Winvalid-pch)
-
-# Optimizations
-add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls)
-
-# C++ Flags
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")
\ No newline at end of file
+\r
+\r
+if(NOT CMAKE_CROSSCOMPILING)\r
+\r
+add_definitions(-fshort-wchar)\r
+\r
+\r
+else()\r
+\r
+# Linking\r
+link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw)\r
+set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")\r
+set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds")\r
+\r
+# Compiler Core\r
+add_definitions(-pipe -fms-extensions)\r
+\r
+set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")\r
+\r
+# Debugging (Note: DWARF-4 on 4.5.1 when we ship)\r
+add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types)\r
+\r
+# Tuning\r
+add_definitions(-march=pentium -mtune=i686)\r
+\r
+# Warnings\r
+add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value -Winvalid-pch)\r
+\r
+# Optimizations\r
+add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls)\r
+\r
+# C++ Flags\r
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti")\r
+\r
+# Macros\r
+macro(set_entrypoint MODULE ENTRYPOINT)\r
+  set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,-entry,_${ENTRYPOINT}")\r
+endmacro()\r
+\r
+macro(add_importlibs MODULE)\r
+  FOREACH(LIB ${ARGN})\r
+    target_link_libraries(${MODULE} ${LIB}.a)\r
+  ENDFOREACH()\r
+endmacro()\r
+\r
+macro(set_module_type MODULE TYPE)\r
+  target_link_libraries(calc mingw_wmain mingw_common)\r
+  if(${TYPE} MATCHES win32gui)\r
+    set_entrypoint(${MODULE} wWinMainCRTStartup)\r
+  endif()\r
+endmacro()\r
+\r
+endif()\r
+\r

diff --git a/msc.cmake b/msc.cmake
index 97e567d..f89f181 100644 (file)
--- a/msc.cmake
+++ b/msc.cmake
@@ -1,3 +1,33 @@
-
-add_definitions(/GS- /Zl /Zi)
-add_definitions(-Dinline=__inline -D__STDC__=1)
\ No newline at end of file
+\r
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86")\r
+  add_definitions(-D__i386__)\r
+endif()\r
+\r
+add_definitions(-Dinline=__inline)\r
+\r
+if(NOT CMAKE_CROSSCOMPILING)\r
+\r
+\r
+\r
+else()\r
+\r
+add_definitions(/GS- /Zl /Zi)\r
+add_definitions(-Dinline=__inline -D__STDC__=1)\r
+\r
+macro(set_entrypoint MODULE ENTRYPOINT)\r
+  set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "/ENTRY:${ENTRYPOINT}")\r
+endmacro()\r
+\r
+macro(add_importlibs MODULE)\r
+  FOREACH(LIB ${ARGN})\r
+    target_link_libraries(${MODULE} ${LIB}.LIB)\r
+  ENDFOREACH()\r
+endmacro()\r
+\r
+macro(set_module_type MODULE TYPE)\r
+  if (${TYPE} MATCHES win32gui)\r
+    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "/subsystem:windows")\r
+  endif ()\r
+endmacro()\r
+\r
+endif()\r