Address CR feedback

dotnet · Mar 20, 2020 · 5324f02 · 5324f02
1 parent 27eef50
commit 5324f02
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
@@ -14,6 +14,7 @@ endif (CLR_CMAKE_HOST_WIN32)
 
 if(MSVC)
   set(CMAKE_CXX_STANDARD_LIBRARIES "") # do not link against standard win32 libs i.e. kernel32, uuid, user32, etc.
+  add_compile_options(/Zc:strictStrings)
   if (CLR_CMAKE_HOST_ARCH_I386)
     add_compile_options(/Gz)
   endif (CLR_CMAKE_HOST_ARCH_I386)

diff --git a/src/coreclr/tests/CMakeLists.txt b/src/coreclr/tests/CMakeLists.txt
@@ -8,6 +8,7 @@ include(${CLR_ENG_NATIVE_DIR}/configurecompiler.cmake)
 set(INC_PLATFORM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/Common/Platform)
 if (CLR_CMAKE_TARGET_WIN32)
     add_definitions(-DWINDOWS)
+    add_compile_options(/Zc:strictStrings)
     if (CLR_CMAKE_HOST_ARCH_I386)
         add_compile_options(/Gz)
     endif (CLR_CMAKE_HOST_ARCH_I386)

diff --git a/src/libraries/Native/Unix/CMakeLists.txt b/src/libraries/Native/Unix/CMakeLists.txt
@@ -89,6 +89,7 @@ elseif (CLR_CMAKE_TARGET_ARCH_ARM)
 endif ()
 
 if(CLR_CMAKE_TARGET_ANDROID)
+    add_definitions(-DTARGET_ANDROID)
     include_directories(SYSTEM "${CROSS_ROOTFS}/usr/include")
 endif()