cmakelists update

Author: raedrizqie

CMakeLists.txt

@@ -109,7 +109,9 @@ if(WIN32)
     add_compile_options(/guard:cf)
     add_link_options(/guard:cf)
   else()
-    add_compile_options(-fcf-protection)
+    if(LLVM_NATIVE_ARCH MATCHES "X86")
+      add_compile_options(-fcf-protection)
+    endif()
   endif()
 endif(WIN32)
 

cmake/modules/HandleLLVMOptions.cmake

@@ -238,6 +238,10 @@ endif( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32 )
 
 if (LLVM_BUILD_STATIC)
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
+  if(MINGW)
+    # We want to mimic MSVC standalone build here
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static")
+  endif()
 endif()
 
 if( XCODE )
@@ -425,12 +429,18 @@ elseif( LLVM_COMPILER_IS_GCC_COMPATIBLE )
     append("-Wno-unknown-pragmas" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
 
     if (MINGW)
+      append("-Wno-cast-function-type-mismatch" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
       append("-Wno-implicit-fallthrough" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
       append("-Wno-missing-exception-spec" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
       append("-Wno-reorder-ctor" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
       append("-Wno-sign-compare" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
       append("-Wno-unused-const-variable" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
       append("-Wno-unused-function" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
+      append("-Wno-unused-private-field" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
+
+      if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+        append("-Wno-gnu-zero-variadic-macro-arguments" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
+      endif()
     endif()
 
     add_flag_if_supported("-Wno-unused-but-set-variable" UNUSED_BUT_SET_VARIABLE)

projects/CMakeLists.txt

@@ -1,11 +1,11 @@
 set(DXC_PROJECTS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(DXC_PROJECTS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
-if(WIN32)
+if(MSVC)
 add_subdirectory(include/Tracing) # DxcRuntimeEtw target
 
 if(HLSL_BUILD_DXILCONV)
   add_subdirectory(dxilconv)
 endif (HLSL_BUILD_DXILCONV)
 
-endif (WIN32)
+endif (MSVC)

tools/clang/CMakeLists.txt

@@ -431,6 +431,9 @@ install(DIRECTORY include/clang-c
   )
 
 add_definitions( -D_GNU_SOURCE )
+if (MINGW)
+  add_definitions( -DMS_SUPPORT_VARIABLE_LANGOPTS )
+endif()
 
 option(CLANG_ENABLE_ARCMT "Build ARCMT." ON)
 if (CLANG_ENABLE_ARCMT)

tools/clang/tools/dxclib/CMakeLists.txt

@@ -37,4 +37,4 @@ endif (MSVC)
 target_compile_definitions(dxclib
     PRIVATE VERSION_STRING_SUFFIX=" for ${CMAKE_SYSTEM_NAME}")
 
-add_dependencies(dxclib TablegenHLSLOptions dxcompiler)
+add_dependencies(dxclib TablegenHLSLOptions)

tools/clang/tools/dxcvalidator/CMakeLists.txt

@@ -19,10 +19,5 @@ add_clang_library(dxcvalidator
   dxcvalidator.cpp
   )
 
-if (MINGW)
-  target_link_options(dxcvalidator PUBLIC -mconsole -municode)
-  target_link_libraries(dxcvalidator PRIVATE version)
-endif()
-
 target_compile_definitions(dxcvalidator
     PRIVATE VERSION_STRING_SUFFIX=" for ${CMAKE_SYSTEM_NAME}")

tools/clang/tools/dxildll/CMakeLists.txt

@@ -41,7 +41,7 @@ set(sources
   dxcvalidator.cpp
 )
 
-if (WIN32)
+if (MSVC)
 add_clang_library(dxildll SHARED ${sources})
 list(APPEND DXCLibs
   kernel32.lib
@@ -58,7 +58,7 @@ target_link_libraries(dxildll PRIVATE
   dxcvalidator
 )
 
-if (WIN32)
+if (MSVC)
 add_dependencies(dxildll
     ${DXCDependencies}
     DxcEtw
@@ -77,7 +77,7 @@ if (WIN32)
     set_target_properties(${target_name} PROPERTIES SOURCES "${sources}")
 
     set_property(SOURCE dxildll.rc PROPERTY COMPILE_DEFINITIONS "INCLUDE_HLSL_VERSION_FILE=1")
-    set_property(SOURCE dxildll.rc PROPERTY COMPILE_OPTIONS "/I" "${HLSL_VERSION_LOCATION}" "/I" "${LLVM_MAIN_SRC_DIR}")
+    set_property(SOURCE dxildll.rc PROPERTY COMPILE_OPTIONS "-I" "${HLSL_VERSION_LOCATION}" "-I" "${LLVM_MAIN_SRC_DIR}")
 endif()
 
 set_target_properties(dxildll