commit 4b8b078256411d0de000ecb95f30f03e00371157
author Antonio Maiorano <amaiorano@google.com> Mon Mar 23 14:11:01 2020 -0400
committer Antonio Maiorano <amaiorano@google.com> Mon Mar 23 22:35:20 2020 +0000
tree c29b7d50f8d4ea5ca39a0395cf886a1fb3fec086
parent 12e857a3bca20092bf372b33187595edb8989147

CMake: make SWIFTSHADER_DCHECK_ALWAYS_ON work on Windows

Bug: b/145758253
Change-Id: Ie444337ea0efe91820d64400a857136f800cd3d6
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/42788
Presubmit-Ready: Antonio Maiorano <amaiorano@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Antonio Maiorano <amaiorano@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 783d14a..7177635 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -505,10 +505,6 @@
         set_cpp_flag("-s" RELEASE)
     endif()
 
-    if(SWIFTSHADER_DCHECK_ALWAYS_ON)
-        list(APPEND SWIFTSHADER_COMPILE_OPTIONS "-DDCHECK_ALWAYS_ON")
-    endif()
-
     # For distribution it is more important to be slim than super optimized
     set_cpp_flag("-Os" RELEASE)
     set_cpp_flag("-Os" RELWITHDEBINFO)
@@ -539,6 +535,10 @@
     endif()
 endif()
 
+if(SWIFTSHADER_DCHECK_ALWAYS_ON)
+    list(APPEND SWIFTSHADER_COMPILE_OPTIONS "-DDCHECK_ALWAYS_ON")
+endif()
+
 if(SWIFTSHADER_WARNINGS_AS_ERRORS)
     if(MSVC)
         set(WARNINGS_AS_ERRORS "/WX")  # Treat all warnings as errors