Skip to content

Commit

Permalink
cmake: support both Windows, WindowsStore
Browse files Browse the repository at this point in the history
  • Loading branch information
luncliff authored and talumbau committed Dec 18, 2023
1 parent 690c14c commit cd7b926
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions ruy/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# To regenerate, run:
# cmake/bazel_to_cmake.sh

if(CMAKE_SYSTEM_NAME STREQUAL Windows)
if(CMAKE_SYSTEM_NAME MATCHES Windows) # Windows or WindowsStore
set(ruy_0_Wall_Wcxx14_compat_Wextra_Wundef "")
else()
set(ruy_0_Wall_Wcxx14_compat_Wextra_Wundef "-Wall;-Wextra;-Wc++14-compat;-Wundef")
Expand Down Expand Up @@ -105,7 +105,7 @@ ruy_cc_library(
${ruy_2_O3}
)

if(CMAKE_SYSTEM_NAME STREQUAL Windows)
if(CMAKE_SYSTEM_NAME MATCHES Windows) # Windows or WindowsStore
set(ruy_3_pthread "")
else()
set(ruy_3_pthread "-pthread")
Expand Down Expand Up @@ -393,7 +393,7 @@ ruy_cc_library(
${ruy_2_O3}
)

if(CMAKE_SYSTEM_NAME STREQUAL Windows)
if(CMAKE_SYSTEM_NAME MATCHES Windows) # Windows or WindowsStore
set(ruy_4_Wno_undef "")
else()
set(ruy_4_Wno_undef "-Wno-undef")
Expand Down Expand Up @@ -1297,7 +1297,7 @@ ruy_cc_library(
ruy_mul_params
)

if(CMAKE_SYSTEM_NAME STREQUAL Windows)
if(CMAKE_SYSTEM_NAME MATCHES Windows) # Windows or WindowsStore
set(ruy_10_lm "")
else()
set(ruy_10_lm "-lm")
Expand Down
2 changes: 1 addition & 1 deletion ruy/profiler/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ else()
set(ruy_profiler_0_RUY_PROFILER "")
endif()

if(CMAKE_SYSTEM_NAME STREQUAL Windows)
if(CMAKE_SYSTEM_NAME MATCHES Windows) # Windows or WindowsStore
set(ruy_profiler_1_pthread "")
else()
set(ruy_profiler_1_pthread "-pthread")
Expand Down

0 comments on commit cd7b926

Please sign in to comment.