From 9b481add8c41ba8954e196ae47085c1692016713 Mon Sep 17 00:00:00 2001 From: Jacek Blaszczynski Date: Mon, 18 Sep 2017 18:03:34 +0200 Subject: Correct reporoot/CMakeList.txt typos --- CMakeLists.txt | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 5dfbc40310..8f77b5f783 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ endif() # Ensure other tools are present if (WIN32) if(CLR_CMAKE_HOST_ARCH STREQUAL arm) - + # Confirm that Windows SDK is present if(NOT DEFINED CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION OR CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION STREQUAL "" ) message(FATAL_ERROR "Windows SDK is required for the Arm32 build.") @@ -57,9 +57,9 @@ if (WIN32) else() file(TO_CMAKE_PATH "$ENV{VCToolsInstallDir}\\bin\\HostX86\\arm\\armasm.exe" CMAKE_ASM_COMPILER) endif() - + set(CMAKE_ASM_MASM_COMPILER ${CMAKE_ASM_COMPILER}) - message("CMAKE_ASM_MASM_COMPILER explicitly set to: ${CMAKE_ASM_MASM_COMPILER}") + message("CMAKE_ASM_MASM_COMPILER explicitly set to: ${CMAKE_ASM_MASM_COMPILER}") # Enable generic assembly compilation to avoid CMake generate VS proj files that explicitly # use ml[64].exe as the assembler. @@ -75,13 +75,13 @@ if (WIN32) endif() if (CLR_CMAKE_HOST_ARCH STREQUAL arm64) - # CMAKE_CXX_COMPILER will default to the compiler installed with - # Visual studio. Overwrite it to the compiler on the path. - # TODO, remove when cmake generator supports Arm64 as a target. - find_program(PATH_CXX_COMPILER cl) - set(CMAKE_CXX_COMPILER ${PATH_CXX_COMPILER}) - message("Overwriting the CMAKE_CXX_COMPILER.") - message(CMAKE_CXX_COMPILER found:${CMAKE_CXX_COMPILER}) + # CMAKE_CXX_COMPILER will default to the compiler installed with + # Visual studio. Overwrite it to the compiler on the path. + # TODO, remove when cmake generator supports Arm64 as a target. + find_program(PATH_CXX_COMPILER cl) + set(CMAKE_CXX_COMPILER ${PATH_CXX_COMPILER}) + message("Overwriting the CMAKE_CXX_COMPILER.") + message(CMAKE_CXX_COMPILER found:${CMAKE_CXX_COMPILER}) endif() else (WIN32) @@ -97,7 +97,7 @@ else (WIN32) # but the generated executables won't work on a system where PAX is set # to prevent applications to create executable memory mappings. find_program(PAXCTL paxctl) - + if (CMAKE_SYSTEM_NAME STREQUAL Darwin) # Ensure that dsymutil and strip are present @@ -155,7 +155,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Linux) endif() else() # CMAKE_SYSTEM_PROCESSOR returns the value of `uname -p` on target. - # For the AMD/Intel 64bit architecure two different strings are common. + # For the AMD/Intel 64bit architecture two different strings are common. # Linux and Darwin identify it as "x86_64" while FreeBSD and netbsd uses the # "amd64" string. Accept either of the two here. if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL amd64) @@ -330,13 +330,13 @@ if (WIN32) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO") #Do not create Side-by-Side Assembly Manifest if (CLR_CMAKE_PLATFORM_ARCH_ARM) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.02") #windows subsystem - arm minimum is 6.02 + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.02") #windows subsystem - arm minimum is 6.02 elseif(CLR_CMAKE_PLATFORM_ARCH_ARM64) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.03") #windows subsystem - arm64 minimum is 6.03 + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.03") #windows subsystem - arm64 minimum is 6.03 else () set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,6.01") #windows subsystem endif () - + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LARGEADDRESSAWARE") # can handle addresses larger than 2 gigabytes set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NXCOMPAT") #Compatible with Data Execution Prevention set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DYNAMICBASE") #Use address space layout randomization @@ -375,11 +375,11 @@ if (WIN32) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /machine:arm64") endif(CLR_CMAKE_PLATFORM_ARCH_ARM64) - # Force uCRT to be dynamically linked for Release build - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") - set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") - set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") - set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") + # Force uCRT to be dynamically linked for Release build + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") + set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") + set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") + set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib") elseif (CLR_CMAKE_PLATFORM_UNIX) # Set the values to display when interactively configuring CMAKE_BUILD_TYPE @@ -442,11 +442,11 @@ elseif (CLR_CMAKE_PLATFORM_UNIX) endif(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL CHECKED) endif(WIN32) -if(CLR_CMAKE_PLATFORM_LINUX) +if(CLR_CMAKE_PLATFORM_LINUX) set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -Wa,--noexecstack") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--build-id=sha1") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id=sha1") -endif(CLR_CMAKE_PLATFORM_LINUX) +endif(CLR_CMAKE_PLATFORM_LINUX) #------------------------------------ # Definitions (for platform) @@ -501,9 +501,9 @@ if (CLR_CMAKE_PLATFORM_UNIX) message("Detected FreeBSD amd64") endif(CLR_CMAKE_PLATFORM_FREEBSD) - if(CLR_CMAKE_PLATFORM_NETBSD) - message("Detected NetBSD amd64") - endif(CLR_CMAKE_PLATFORM_NETBSD) + if(CLR_CMAKE_PLATFORM_NETBSD) + message("Detected NetBSD amd64") + endif(CLR_CMAKE_PLATFORM_NETBSD) endif(CLR_CMAKE_PLATFORM_UNIX) if (WIN32) @@ -574,7 +574,7 @@ endif() # Above projects do not build with these compile options # All of the compiler options are specified in file compileoptions.cmake -# Do not add any new options here. They shoul be added in compileoptions.cmake +# Do not add any new options here. They should be added in compileoptions.cmake if(WIN32) add_compile_options(/FIWarningControl.h) # force include of WarningControl.h add_compile_options(/Zl) # omit default library name in .OBJ -- cgit v1.2.3