Author: akhaldi Date: Mon Dec 27 18:29:10 2010 New Revision: 50169
URL: http://svn.reactos.org/svn/reactos?rev=50169&view=rev Log: [CMAKE] - Improve formatting.
Modified: branches/cmake-bringup/toolchain-mingw32.cmake
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] Mon Dec 27 18:29:10 2010 @@ -1,41 +1,43 @@
if(NOT ARCH) -set(ARCH i386) -endif(NOT ARCH) + set(ARCH i386) +endif()
# Choose the right MinGW prefix if(ARCH MATCHES i386)
-if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) -set(MINGW_PREFIX "" CACHE STRING "MinGW Prefix") -else() -set(MINGW_PREFIX "mingw32-" CACHE STRING "MinGW Prefix") -endif(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + set(MINGW_PREFIX "" CACHE STRING "MinGW Prefix") + else() + set(MINGW_PREFIX "mingw32-" CACHE STRING "MinGW Prefix") + endif(CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
elseif(ARCH MATCHES amd64) -set(MINGW_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Prefix") -endif(ARCH MATCHES i386) + set(MINGW_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Prefix") +endif()
if(ENABLE_CCACHE) -set(CCACHE "ccache" CACHE STRING "ccache") + set(CCACHE "ccache" CACHE STRING "ccache") else() -set(CCACHE "" CACHE STRING "ccache") + set(CCACHE "" CACHE STRING "ccache") endif()
# the name of the target operating system -SET(CMAKE_SYSTEM_NAME Windows) -SET(CMAKE_SYSTEM_PROCESSOR i686) +set(CMAKE_SYSTEM_NAME Windows) +set(CMAKE_SYSTEM_PROCESSOR i686)
# which compilers to use for C and C++ -SET(CMAKE_C_COMPILER ${CCACHE} ${MINGW_PREFIX}gcc) -SET(CMAKE_CXX_COMPILER ${CCACHE} ${MINGW_PREFIX}g++) -SET(CMAKE_RC_COMPILER ${MINGW_PREFIX}windres) -SET(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) -SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") -SET(CMAKE_IDL_COMPILER native-widl) +set(CMAKE_C_COMPILER ${CCACHE} ${MINGW_PREFIX}gcc) +set(CMAKE_CXX_COMPILER ${CCACHE} ${MINGW_PREFIX}g++) +set(CMAKE_RC_COMPILER ${MINGW_PREFIX}windres) +set(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) +set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") +set(CMAKE_IDL_COMPILER native-widl)
-SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m32 --win32 -h -H <OBJECT> <SOURCE>") -SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ") +set(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m32 --win32 -h -H <OBJECT> <SOURCE>") +set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ") + +set(CMAKE_C_CREATE_STATIC_LIBRARY "${MINGW_PREFIX}ar crs <TARGET> <LINK_FLAGS> <OBJECTS>")
# Use stdcall fixups, and don't link with anything by default unless we say so set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") @@ -44,11 +46,11 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ Libraries")
if(ARCH MATCHES i386) -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") + set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") #-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds elseif(ARCH MATCHES amd64) -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") -endif(ARCH MATCHES i386) + set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") +endif()
# adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search @@ -56,4 +58,3 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -
-
akhaldi＠svn.reactos.org