NFC. Cleanup CMake warnings (#4045)

microsoft · Oct 28, 2021 · 344953a · 344953a
1 parent e343bec
commit 344953a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/cmake/modules/FindDiaSDK.cmake b/cmake/modules/FindDiaSDK.cmake
@@ -48,7 +48,7 @@ if (MSVC_VERSION GREATER_EQUAL 1900)
   else (CMAKE_GENERATOR_PLATFORM STREQUAL "x64")
     find_library(DIASDK_GUIDS_LIBRARY NAMES diaguids.lib HINTS ${DIASDK_INCLUDE_DIR}/../lib )
   endif(CMAKE_GENERATOR_PLATFORM STREQUAL "x64")
-endif (CMAKE_GENERATOR MATCHES "Visual Studio 16 2019")
+endif (MSVC_VERSION GREATER_EQUAL 1900)
 
 set(DIASDK_LIBRARIES ${DIASDK_GUIDS_LIBRARY})
 set(DIASDK_INCLUDE_DIRS ${DIASDK_INCLUDE_DIR})
@@ -59,4 +59,4 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(DiaSDK  DEFAULT_MSG
                                   DIASDK_LIBRARIES DIASDK_INCLUDE_DIR)
 
-mark_as_advanced(DIASDK_INCLUDE_DIRS DIASDK_LIBRARIES)
+mark_as_advanced(DIASDK_INCLUDE_DIRS DIASDK_LIBRARIES)
diff --git a/tools/clang/CMakeLists.txt b/tools/clang/CMakeLists.txt
@@ -499,7 +499,9 @@ if( CLANG_INCLUDE_TESTS OR HLSL_INCLUDE_TESTS ) # HLSL Change
       clang_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/test/Unit/lit.site.cfg
       )
   endif()
-  add_subdirectory(test)
+  if (CLANG_INCLUDE_TESTS) # HLSL Change - respect variable for clang tests
+    add_subdirectory(test)
+  endif()
 
   if(CLANG_BUILT_STANDALONE)
     # Add a global check rule now that all subdirectories have been traversed

diff --git a/tools/clang/test/CMakeLists.txt b/tools/clang/test/CMakeLists.txt
@@ -62,6 +62,12 @@ if( NOT CLANG_BUILT_STANDALONE )
     )
 endif()
 
+# HLSL Change Begin
+# Explicitly overriding check-clang dependencies for HLSL
+set(CLANG_TEST_DEPS clang opt FileCheck count not)
+# HLSL Change End
+
+
 add_lit_testsuite(check-clang "Running the Clang regression tests"
   ${CMAKE_CURRENT_BINARY_DIR}
   #LIT ${LLVM_LIT}

diff --git a/tools/opt/CMakeLists.txt b/tools/opt/CMakeLists.txt
@@ -45,7 +45,7 @@ if(WIN32 AND HLSL_BUILD_DXILCONV)
   target_link_libraries(opt DxilConvPasses
 )
 add_dependencies(opt DxilConvPasses)
-endif(WIN32)
+endif(WIN32 AND HLSL_BUILD_DXILCONV)
 
 export_executable_symbols(opt)