Add packagereference to System.IO.FileSystem.AccessControl

[platform/upstream/coreclr.git] / tests / CMakeLists.txt

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e667e59..665b368 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,38 +1,17 @@
-# Require at least version 2.8.12 of CMake
-cmake_minimum_required(VERSION 2.8.12)
+# Require at least version 3.5.1 of CMake
+cmake_minimum_required(VERSION 3.5.1)
 
-if (CMAKE_CONFIGURATION_TYPES) # multi-configuration generator?
-    set(CMAKE_CONFIGURATION_TYPES "Debug;Checked;Release;RelWithDebInfo" CACHE STRING "" FORCE)
-endif (CMAKE_CONFIGURATION_TYPES)
-set(CMAKE_C_FLAGS_CHECKED "")
-set(CMAKE_CXX_FLAGS_CHECKED "")
-set(CMAKE_EXE_LINKER_FLAGS_CHECKED "")
-set(CMAKE_SHARED_LINKER_FLAGS_CHECKED "")
-
-set(CLR_CMAKE_TARGET_ARCH ${CLR_CMAKE_HOST_ARCH})
+cmake_policy(SET CMP0042 NEW)
 
 set(INC_PLATFORM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/Common/Platform)
 if (WIN32)
-    add_definitions(-DWINDOWS=1)
-
-    if (DEFINED ENV{__ToolsetDir})
-        # Hack for private Tool Set
-        # CMAKE_CXX_COMPILER will default to the compiler installed with
-        # Visual studio. Overwrite it to the compiler on the path.
-
-        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}")
-      
-        # Temporary until cmake has VS generators for hacky toolsets [arm64]
-        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /machine:${CLR_CMAKE_TARGET_ARCH}")
-        set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /machine:${CLR_CMAKE_TARGET_ARCH}")
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /machine:${CLR_CMAKE_TARGET_ARCH}")
-    endif()
+    add_definitions(-DWINDOWS)
 endif()
 
+# Verify that LTCG/LTO is available
+include(${CMAKE_CURRENT_SOURCE_DIR}/../configure.cmake)
+# Include global configure settings
+include(${CMAKE_CURRENT_SOURCE_DIR}/../configurecompiler.cmake)
 # Compile options
 
 if (WIN32)