We don't? Doesn't this break WDK builds?
Am 07.08.2013 14:28, schrieb akha...@svn.reactos.org: > Author: akhaldi > Date: Wed Aug 7 12:28:47 2013 > New Revision: 59663 > > URL: http://svn.reactos.org/svn/reactos?rev=59663&view=rev > Log: > [CMAKE] > * We no longer need to maintain a transitional compatibility with the old > CMake/RosBE for MSVC builds. > > Removed: > trunk/reactos/cmake/Platform/Windows-cl.cmake > > Removed: trunk/reactos/cmake/Platform/Windows-cl.cmake > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-cl.cmake?rev=59662 > ============================================================================== > --- trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) > +++ trunk/reactos/cmake/Platform/Windows-cl.cmake (removed) > @@ -1,307 +0,0 @@ > -# try to load any previously computed information for C on this platform > -INCLUDE( ${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake OPTIONAL) > -# try to load any previously computed information for CXX on this platform > -INCLUDE( ${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake OPTIONAL) > - > -SET(WIN32 1) > - > -INCLUDE(Platform/cl) > - > -############ > -# Detect WDK build environment > -IF($ENV{DDKBUILDENV} MATCHES "chk") > - MESSAGE(STATUS "DDK/WDK checked build environment detected.") > - SET(CMAKE_USE_WDK_ENV 1) > -ENDIF() > - > -IF($ENV{DDKBUILDENV} MATCHES "fre") > - MESSAGE(STATUS "DDK/WDK free build environment detected.") > - SET(CMAKE_USE_WDK_ENV 1) > -ENDIF() > - > -if(CMAKE_USE_WDK_ENV) > - > - # Detect output architecture > - if(NOT ARCH) > - if($ENV{AMD64} MATCHES 1) > - set(ARCH amd64) > - set(MSVC_C_ARCHITECTURE_ID 64) > - else() > - set(ARCH i386) > - endif() > - endif() > - > - # Force C/C++ Compilers > - include(CMakeForceCompiler) > - CMAKE_FORCE_C_COMPILER(cl MSVC) > - CMAKE_FORCE_CXX_COMPILER(cl MSVC) > - > - # Add library directories > - STRING(REPLACE * ${ARCH} ATL_LIB_PATH $ENV{ATL_LIB_PATH}) > - STRING(REPLACE * ${ARCH} CRT_LIB_PATH $ENV{CRT_LIB_PATH}) > - STRING(REPLACE * ${ARCH} DDK_LIB_PATH $ENV{DDK_LIB_PATH}) > - STRING(REPLACE * ${ARCH} KMDF_LIB_PATH $ENV{KMDF_LIB_PATH}) > - STRING(REPLACE * ${ARCH} MFC_LIB_PATH $ENV{MFC_LIB_PATH}) > - STRING(REPLACE * ${ARCH} SDK_LIB_PATH $ENV{SDK_LIB_PATH}) > - LINK_DIRECTORIES(${ATL_LIB_PATH} > - ${CRT_LIB_PATH} > - ${DDK_LIB_PATH} > - ${IFSKIT_LIB_PATH} > - ${KMDF_LIB_PATH} > - ${MFC_LIB_PATH} > - ${SDK_LIB_PATH}) > - > - # Add environment variables > - if(NOT CMAKE_CROSSCOMPILING) > - set(ENV{INCLUDE} > "$ENV{CRT_INC_PATH};$ENV{SDK_INC_PATH};$ENV{SDK_INC_PATH}\\crt\\stl60") > - include_directories($ENV{INCLUDE}) > - set(ENV{LIBPATH} "${CRT_LIB_PATH};${SDK_LIB_PATH}") > - set(ENV{USE_MSVCRT} 1) > - set(ENV{USE_STL} 1) > - set(ENV{STL_VER} 60) > - endif() > -endif() > - > -############ > - > -# Set lib path for ARM compiler > -if(${ARCH} MATCHES arm) > - message("Using ARM build for cross compilation. Host tools are x86.") > - > - # Force C/C++ Compilers > - include(CMakeForceCompiler) > - CMAKE_FORCE_C_COMPILER(cl MSVC) > - CMAKE_FORCE_CXX_COMPILER(cl MSVC) > - > - if(NOT CMAKE_CROSSCOMPILING) > - message("Using x86 target for ARM host tools.") > - set(ARCH i386) > - > - LINK_DIRECTORIES($ENV{WindowsSdkDir}\\Lib\\win8\\um\\x86) > - endif() > - > - #LINK_DIRECTORIES($ENV{LIB}) > -endif() > - > - > -############ > - > -SET(CMAKE_CREATE_WIN32_EXE /subsystem:windows) > -SET(CMAKE_CREATE_CONSOLE_EXE /subsystem:console) > - > -IF(CMAKE_GENERATOR MATCHES "Visual Studio 6") > - SET (CMAKE_NO_BUILD_TYPE 1) > -ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 6") > -IF(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio") > - SET (CMAKE_NO_BUILD_TYPE 1) > - SET (CMAKE_CONFIGURATION_TYPES "Debug;Release;MinSizeRel;RelWithDebInfo" > CACHE STRING > - "Semicolon separated list of supported configuration types, only > supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything else will > be ignored.") > - MARK_AS_ADVANCED(CMAKE_CONFIGURATION_TYPES) > -ENDIF(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio") > -# does the compiler support pdbtype and is it the newer compiler > -IF(CMAKE_GENERATOR MATCHES "Visual Studio 8") > - SET(CMAKE_COMPILER_2005 1) > -ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8") > - > -# make sure to enable languages after setting configuration types > -ENABLE_LANGUAGE(RC) > -SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>") > - > -# for nmake we need to compute some information about the compiler > -# that is being used. > -# the compiler may be free command line, 6, 7, or 71, and > -# each have properties that must be determined. > -# to avoid running these tests with each cmake run, the > -# test results are saved in CMakeCPlatform.cmake, a file > -# that is automatically copied into try_compile directories > -# by the global generator. > -SET(MSVC_IDE 1) > -IF(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja") > - SET(MSVC_IDE 0) > - IF(NOT CMAKE_VC_COMPILER_TESTS_RUN) > - SET(CMAKE_VC_COMPILER_TESTS 1) > - SET(testNmakeCLVersionFile > - "${CMAKE_ROOT}/Modules/CMakeTestNMakeCLVersion.c") > - STRING(REGEX REPLACE "/" "\\\\" testNmakeCLVersionFile > "${testNmakeCLVersionFile}") > - MESSAGE(STATUS "Check for CL compiler version") > - SET(CMAKE_TEST_COMPILER ${CMAKE_C_COMPILER}) > - IF (NOT CMAKE_C_COMPILER) > - SET(CMAKE_TEST_COMPILER ${CMAKE_CXX_COMPILER}) > - ENDIF(NOT CMAKE_C_COMPILER) > - EXEC_PROGRAM(${CMAKE_TEST_COMPILER} > - ARGS /nologo -EP \"${testNmakeCLVersionFile}\" > - OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT > - RETURN_VALUE CMAKE_COMPILER_RETURN > - ) > - IF(NOT CMAKE_COMPILER_RETURN) > - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log > - "Determining the version of compiler passed with the following > output:\n" > - "${CMAKE_COMPILER_OUTPUT}\n\n") > - STRING(REGEX REPLACE "\n" " " compilerVersion > "${CMAKE_COMPILER_OUTPUT}") > - STRING(REGEX REPLACE ".*VERSION=(.*)" "\\1" > - compilerVersion "${compilerVersion}") > - MESSAGE(STATUS "Check for CL compiler version - ${compilerVersion}") > - SET(MSVC60) > - SET(MSVC70) > - SET(MSVC71) > - SET(MSVC80) > - SET(CMAKE_COMPILER_2005) > - IF("${compilerVersion}" LESS 1300) > - SET(MSVC60 1) > - SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE 1) > - ENDIF("${compilerVersion}" LESS 1300) > - IF("${compilerVersion}" EQUAL 1300) > - SET(MSVC70 1) > - SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE 0) > - ENDIF("${compilerVersion}" EQUAL 1300) > - IF("${compilerVersion}" EQUAL 1310) > - SET(MSVC71 1) > - SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE 0) > - ENDIF("${compilerVersion}" EQUAL 1310) > - IF("${compilerVersion}" EQUAL 1400) > - SET(MSVC80 1) > - SET(CMAKE_COMPILER_2005 1) > - ENDIF("${compilerVersion}" EQUAL 1400) > - IF("${compilerVersion}" EQUAL 1500) > - SET(MSVC90 1) > - ENDIF("${compilerVersion}" EQUAL 1500) > - IF("${compilerVersion}" EQUAL 1600) > - SET(MSVC10 1) > - ENDIF("${compilerVersion}" EQUAL 1600) > - SET(MSVC_VERSION "${compilerVersion}") > - ELSE(NOT CMAKE_COMPILER_RETURN) > - MESSAGE(STATUS "Check for CL compiler version - failed") > - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log > - "Determining the version of compiler failed with the following > output:\n" > - "${CMAKE_COMPILER_OUTPUT}\n\n") > - ENDIF(NOT CMAKE_COMPILER_RETURN) > - # try to figure out if we are running the free command line > - # tools from Microsoft. These tools do not provide debug libraries, > - # so the link flags used have to be different. > - MAKE_DIRECTORY("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp2") > - SET(testForFreeVCFile > - "${CMAKE_ROOT}/Modules/CMakeTestForFreeVC.cxx") > - STRING(REGEX REPLACE "/" "\\\\" testForFreeVCFile "${testForFreeVCFile}") > - MESSAGE(STATUS "Check if this is a free VC compiler") > - EXEC_PROGRAM(${CMAKE_TEST_COMPILER} > ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp2 > - ARGS /nologo /EHsc > - \"${testForFreeVCFile}\" > - OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT > - RETURN_VALUE CMAKE_COMPILER_RETURN > - ) > - IF(CMAKE_COMPILER_RETURN) > - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log > - "Determining if this is a free VC compiler failed with the following > output:\n" > - "${CMAKE_COMPILER_OUTPUT}\n\n") > - MESSAGE(STATUS "Check if this is a free VC compiler - yes") > - SET(CMAKE_USING_VC_FREE_TOOLS 1) > - ELSE(CMAKE_COMPILER_RETURN) > - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log > - "Determining if this is a free VC compiler passed with the following > output:\n" > - "${CMAKE_COMPILER_OUTPUT}\n\n") > - MESSAGE(STATUS "Check if this is a free VC compiler - no") > - SET(CMAKE_USING_VC_FREE_TOOLS 0) > - ENDIF(CMAKE_COMPILER_RETURN) > - MAKE_DIRECTORY("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp3") > - ENDIF(NOT CMAKE_VC_COMPILER_TESTS_RUN) > -ENDIF(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja") > - > -IF(MSVC_C_ARCHITECTURE_ID MATCHES 64) > - SET(CMAKE_CL_64 1) > -ELSE(MSVC_C_ARCHITECTURE_ID MATCHES 64) > - SET(CMAKE_CL_64 0) > -ENDIF(MSVC_C_ARCHITECTURE_ID MATCHES 64) > -IF(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64) > - SET(CMAKE_CL_64 1) > -ENDIF(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64) > - > -IF("${MSVC_VERSION}" GREATER 1599) > - SET(MSVC_INCREMENTAL_DEFAULT ON) > -ENDIF() > - > -# No support for old versions > -if(MSVC_VERSION LESS 1310) > -message(FATAL_ERROR "Your compiler is too old. Get a newer version!") > -endif() > - > -# 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}") > -# create a C shared library > -#SET(CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}") > -# create a C shared module just copy the shared library rule > -#SET(CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}") > -#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_CXX_FLAGS_DEBUG_INIT "") > -SET(CMAKE_C_FLAGS_DEBUG_INIT "") > -SET(CMAKE_CXX_FLAGS_INIT "") > -SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") > -SET(CMAKE_CXX_FLAGS_RELEASE_INIT "") > -SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") > -SET(CMAKE_C_FLAGS_INIT "") > -SET(CMAKE_C_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") > -SET(CMAKE_C_FLAGS_RELEASE_INIT "") > -SET(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") > -SET(CMAKE_C_STANDARD_LIBRARIES_INIT "") > -SET(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}") > -SET(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}") > - > -# executable linker flags > -SET (CMAKE_LINK_DEF_FILE_FLAG "/DEF:") > -# set the stack size and the machine type > -SET(_MACHINE_ARCH_FLAG ${MSVC_C_ARCHITECTURE_ID}) > -IF(NOT _MACHINE_ARCH_FLAG) > - SET(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID}) > -ENDIF(NOT _MACHINE_ARCH_FLAG) > -# HACK > -if(${ARCH} MATCHES arm) > - SET(_MACHINE_ARCH_FLAG ARM) > -endif() > -SET (CMAKE_EXE_LINKER_FLAGS_INIT > - "${CMAKE_EXE_LINKER_FLAGS_INIT} /STACK:10000000 > /machine:${_MACHINE_ARCH_FLAG}") > - > -# add /debug and /INCREMENTAL:YES to DEBUG and RELWITHDEBINFO also add > pdbtype > -# on versions that support it > -SET( MSVC_INCREMENTAL_YES_FLAG "") > -IF(NOT MSVC_INCREMENTAL_DEFAULT) > - SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:YES") > -ENDIF() > - > -IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) > - SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept > ${MSVC_INCREMENTAL_YES_FLAG}") > - SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept > ${MSVC_INCREMENTAL_YES_FLAG}") > -ELSE (CMAKE_COMPILER_SUPPORTS_PDBTYPE) > - SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug > ${MSVC_INCREMENTAL_YES_FLAG}") > - SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug > ${MSVC_INCREMENTAL_YES_FLAG}") > -ENDIF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) > -# for release and minsize release default to no incremental linking > -SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT "/INCREMENTAL:NO") > -SET(CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT "/INCREMENTAL:NO") > - > -# copy the EXE_LINKER flags to SHARED and MODULE linker flags > -# shared linker flags > -SET (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT}) > -SET (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT > ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) > -SET (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT > ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) > -SET (CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT > ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT}) > -SET (CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL_INIT > ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT}) > -# module linker flags > -SET (CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_SHARED_LINKER_FLAGS_INIT}) > -SET (CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT > ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT}) > -SET (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT > ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT}) > -SET (CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT > ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT}) > -SET (CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL_INIT > ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT}) > - > -# save computed information for this platform > -IF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake") > - CONFIGURE_FILE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake.in > - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCPlatform.cmake > IMMEDIATE) > -ENDIF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake") > - > -IF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake") > - CONFIGURE_FILE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake.in > - > ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCXXPlatform.cmake IMMEDIATE) > -ENDIF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake") > > > _______________________________________________ Ros-dev mailing list Ros-dev@reactos.org http://www.reactos.org/mailman/listinfo/ros-dev
