mirror of
https://github.com/reactos/reactos.git
synced 2024-08-04 02:20:54 +00:00
[CMAKE]
- Get rid of the redundancy in setting msvc flags, and set /ZI instead of /Zi for both host and target modules. - Get rid of the redundancy in setting the default behaviour of the FIND_XXX() commands between toolchain files. svn path=/branches/cmake-bringup/; revision=50688
This commit is contained in:
parent
25b4d48b89
commit
3f7f1e0d7f
|
@ -61,6 +61,13 @@ if(NOT CMAKE_CROSSCOMPILING)
|
|||
|
||||
else()
|
||||
|
||||
# adjust the default behaviour of the FIND_XXX() commands:
|
||||
# search headers and libraries in the target environment, search
|
||||
# programs in the host environment
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
|
||||
# Do some cleanup
|
||||
file(REMOVE
|
||||
${REACTOS_BINARY_DIR}/dependencies.graphml
|
||||
|
|
|
@ -194,7 +194,7 @@ IF("${MSVC_VERSION}" GREATER 1599)
|
|||
ENDIF()
|
||||
|
||||
# default to Debug builds
|
||||
IF(MSVC_VERSION GREATER 1310)
|
||||
if(MSVC_VERSION GREATER 1310)
|
||||
# for 2005 make sure the manifest is put in the dll with mt
|
||||
# SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_LIBRARY}")
|
||||
# SET(CMAKE_CXX_CREATE_SHARED_MODULE "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_MODULE}")
|
||||
|
@ -205,15 +205,15 @@ IF(MSVC_VERSION GREATER 1310)
|
|||
# SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_CXX_LINK_EXECUTABLE}")
|
||||
# SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}")
|
||||
|
||||
SET(CMAKE_BUILD_TYPE_INIT Debug)
|
||||
set(CMAKE_BUILD_TYPE_INIT Debug)
|
||||
|
||||
IF(ENV{DDKBUILDENV} OR NOT CMAKE_CROSSCOMPILING)
|
||||
SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od")
|
||||
SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od")
|
||||
ELSE()
|
||||
SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od")
|
||||
SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od")
|
||||
ENDIF()
|
||||
if(ENV{DDKBUILDENV} OR NOT CMAKE_CROSSCOMPILING)
|
||||
set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /ZI /Ob0 /Od")
|
||||
set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od")
|
||||
else()
|
||||
set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od")
|
||||
set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od")
|
||||
endif()
|
||||
|
||||
SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc")
|
||||
SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG")
|
||||
|
|
|
@ -13,7 +13,7 @@ elseif(OPTIMIZE STREQUAL "5")
|
|||
endif()
|
||||
endif()
|
||||
|
||||
add_definitions(/X /GR- /GS- /Zl /Zi)
|
||||
add_definitions(/X /GR- /GS- /Zl)
|
||||
add_definitions(-Dinline=__inline -D__STDC__=1)
|
||||
|
||||
if(${_MACHINE_ARCH_FLAG} MATCHES X86)
|
||||
|
@ -130,9 +130,6 @@ macro(set_unicode)
|
|||
set(IS_UNICODE 1)
|
||||
endmacro()
|
||||
|
||||
set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")
|
||||
|
||||
macro(set_rc_compiler)
|
||||
# dummy, this workaround is only needed in mingw due to lack of RC support in cmake
|
||||
endmacro()
|
||||
|
|
|
@ -48,10 +48,3 @@ if(ARCH MATCHES i386)
|
|||
elseif(ARCH MATCHES amd64)
|
||||
set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import")
|
||||
endif()
|
||||
|
||||
# adjust the default behaviour of the FIND_XXX() commands:
|
||||
# search headers and libraries in the target environment, search
|
||||
# programs in the host environment
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
|
|
|
@ -20,12 +20,6 @@ set(CMAKE_ASM_COMPILE_OBJECT
|
|||
"<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp")
|
||||
|
||||
set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000")
|
||||
set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")
|
||||
set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od")
|
||||
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
|
||||
set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "")
|
||||
|
||||
|
|
Loading…
Reference in a new issue