aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorLukas Rusak <lorusak@gmail.com>2017-12-22 13:21:53 -0800
committerGitHub <noreply@github.com>2017-12-22 13:21:53 -0800
commit61cc3ece5f2f0576c0e0cf447a716685a0bcb17c (patch)
tree6423425b55c7efc6ef96441c87b02a4782226a2b /cmake
parentfb8cfe1310ab8b9f0998f819af3ed7c801470d88 (diff)
parent93c0e562c232e631011342e9181b3c5370bc8f15 (diff)
Merge pull request #13222 from lrusak/ifdef-cleanup-next
more ifdef cleanup and removal
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modules/FindAvahi.cmake6
-rw-r--r--cmake/modules/FindBluray.cmake5
-rw-r--r--cmake/modules/FindMDNS.cmake8
-rw-r--r--cmake/modules/FindMicroHttpd.cmake2
-rw-r--r--cmake/modules/FindMySqlClient.cmake4
-rw-r--r--cmake/modules/FindNFS.cmake4
-rw-r--r--cmake/modules/FindOpenGLES.cmake18
-rw-r--r--cmake/modules/FindOpenGLES3.cmake24
-rw-r--r--cmake/modules/FindOpenGl.cmake2
-rw-r--r--cmake/modules/FindPlist.cmake4
-rw-r--r--cmake/modules/FindSSH.cmake4
-rw-r--r--cmake/modules/FindShairplay.cmake4
-rw-r--r--cmake/modules/FindSmbClient.cmake4
-rw-r--r--cmake/platform/linux/gbm.cmake2
-rw-r--r--cmake/scripts/android/ArchSetup.cmake3
-rw-r--r--cmake/scripts/freebsd/ArchSetup.cmake3
-rw-r--r--cmake/scripts/ios/ArchSetup.cmake3
-rw-r--r--cmake/scripts/linux/ArchSetup.cmake3
-rw-r--r--cmake/scripts/osx/ArchSetup.cmake3
-rw-r--r--cmake/scripts/windows/ArchSetup.cmake3
-rw-r--r--cmake/scripts/windowsstore/ArchSetup.cmake3
21 files changed, 62 insertions, 50 deletions
diff --git a/cmake/modules/FindAvahi.cmake b/cmake/modules/FindAvahi.cmake
index 77c3e4d67a..068b29264c 100644
--- a/cmake/modules/FindAvahi.cmake
+++ b/cmake/modules/FindAvahi.cmake
@@ -40,21 +40,21 @@ if(AVAHI_FOUND)
${AVAHI_COMMON_INCLUDE_DIR})
set(AVAHI_LIBRARIES ${AVAHI_CLIENT_LIBRARY}
${AVAHI_COMMON_LIBRARY})
- set(AVAHI_DEFINITIONS -DHAVE_LIBAVAHI_CLIENT=1 -DHAVE_LIBAVAHI_COMMON=1)
+ set(AVAHI_DEFINITIONS -DHAS_AVAHI=1 -DHAS_ZEROCONF=1)
if(NOT TARGET Avahi::Avahi)
add_library(Avahi::Avahi UNKNOWN IMPORTED)
set_target_properties(Avahi::Avahi PROPERTIES
IMPORTED_LOCATION "${AVAHI_CLIENT_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${AVAHI_CLIENT_INCLUDE_DIR}"
- INTERFACE_COMPILE_DEFINITIONS HAVE_LIBAVAHI_CLIENT=1)
+ INTERFACE_COMPILE_DEFINITIONS HAS_AVAHI=1)
endif()
if(NOT TARGET Avahi::AvahiCommon)
add_library(Avahi::AvahiCommon UNKNOWN IMPORTED)
set_target_properties(Avahi::AvahiCommon PROPERTIES
IMPORTED_LOCATION "${AVAHI_COMMON_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${AVAHI_COMMON_INCLUDE_DIR}"
- INTERFACE_COMPILE_DEFINITIONS HAVE_LIBAVAHI_COMMON=1
+ INTERFACE_COMPILE_DEFINITIONS HAS_AVAHI=1
INTERFACE_LINK_LIBRARIES Avahi::Avahi)
endif()
endif()
diff --git a/cmake/modules/FindBluray.cmake b/cmake/modules/FindBluray.cmake
index 010fdf1bf7..3c29f54874 100644
--- a/cmake/modules/FindBluray.cmake
+++ b/cmake/modules/FindBluray.cmake
@@ -50,6 +50,11 @@ if(BLURAY_FOUND)
set(BLURAY_INCLUDE_DIRS ${BLURAY_INCLUDE_DIR})
set(BLURAY_DEFINITIONS -DHAVE_LIBBLURAY=1)
+ # todo: improve syntax
+ if (NOT CORE_PLATFORM_NAME_LC STREQUAL windowsstore)
+ list(APPEND BLURAY_DEFINITIONS -DHAVE_LIBBLURAY_BDJ=1)
+ endif()
+
if(NOT TARGET Bluray::Bluray)
add_library(Bluray::Bluray UNKNOWN IMPORTED)
if(BLURAY_LIBRARY)
diff --git a/cmake/modules/FindMDNS.cmake b/cmake/modules/FindMDNS.cmake
index c001f7bb5a..9294708549 100644
--- a/cmake/modules/FindMDNS.cmake
+++ b/cmake/modules/FindMDNS.cmake
@@ -26,9 +26,9 @@ find_package_handle_standard_args(MDNS
if(MDNS_FOUND)
set(MDNS_INCLUDE_DIRS ${MDNS_INCLUDE_DIR})
set(MDNS_LIBRARIES ${MDNS_LIBRARY})
- set(MDNS_DEFINITIONS -DHAVE_LIBMDNS=1)
+ set(MDNS_DEFINITIONS -DHAS_MDNS=1 -DHAS_ZEROCONF=1)
if(MDNS_EMBEDDED_INCLUDE_DIR)
- list(APPEND MDNS_DEFINITIONS -DHAVE_LIBMDNSEMBEDDED=1)
+ list(APPEND MDNS_DEFINITIONS -DHAS_MDNS_EMBEDDED=1)
endif()
if(NOT TARGET MDNS::MDNS)
@@ -36,10 +36,10 @@ if(MDNS_FOUND)
set_target_properties(MDNS::MDNS PROPERTIES
IMPORTED_LOCATION "${MDNS_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${MDNS_INCLUDE_DIR}"
- INTERFACE_COMPILE_DEFINITIONS HAVE_LIBMDNS=1)
+ INTERFACE_COMPILE_DEFINITIONS HAS_MDNS=1)
if(MDNS_EMBEDDED_INCLUDE_DIR)
set_target_properties(MDNS::MDNS PROPERTIES
- INTERFACE_COMPILE_DEFINITIONS HAVE_LIBMDNSEMBEDDED=1)
+ INTERFACE_COMPILE_DEFINITIONS HAS_MDNS_EMBEDDED=1)
endif()
endif()
endif()
diff --git a/cmake/modules/FindMicroHttpd.cmake b/cmake/modules/FindMicroHttpd.cmake
index 8eecbc4e0a..232f8e5464 100644
--- a/cmake/modules/FindMicroHttpd.cmake
+++ b/cmake/modules/FindMicroHttpd.cmake
@@ -33,7 +33,7 @@ find_package_handle_standard_args(MicroHttpd
if(MICROHTTPD_FOUND)
set(MICROHTTPD_LIBRARIES ${MICROHTTPD_LIBRARY})
set(MICROHTTPD_INCLUDE_DIRS ${MICROHTTPD_INCLUDE_DIR})
- set(MICROHTTPD_DEFINITIONS -DHAVE_LIBMICROHTTPD=1)
+ set(MICROHTTPD_DEFINITIONS -DHAS_WEB_SERVER=1 -DHAS_WEB_INTERFACE=1)
if(KODI_DEPENDSBUILD AND NOT WIN32)
find_library(GCRYPT_LIBRARY gcrypt)
diff --git a/cmake/modules/FindMySqlClient.cmake b/cmake/modules/FindMySqlClient.cmake
index 7b485778e4..50db58237b 100644
--- a/cmake/modules/FindMySqlClient.cmake
+++ b/cmake/modules/FindMySqlClient.cmake
@@ -46,7 +46,7 @@ find_package_handle_standard_args(MySqlClient
if(MYSQLCLIENT_FOUND)
set(MYSQLCLIENT_LIBRARIES ${MYSQLCLIENT_LIBRARY})
set(MYSQLCLIENT_INCLUDE_DIRS ${MYSQLCLIENT_INCLUDE_DIR})
- set(MYSQLCLIENT_DEFINITIONS -DHAVE_MYSQL=1)
+ set(MYSQLCLIENT_DEFINITIONS -DHAS_MYSQL=1)
if(NOT TARGET MySqlClient::MySqlClient)
add_library(MySqlClient::MySqlClient UNKNOWN IMPORTED)
@@ -62,7 +62,7 @@ if(MYSQLCLIENT_FOUND)
endif()
set_target_properties(MySqlClient::MySqlClient PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${MYSQLCLIENT_INCLUDE_DIR}"
- INTERFACE_COMPILE_DEFINITIONS HAVE_MYSQL=1)
+ INTERFACE_COMPILE_DEFINITIONS HAS_MYSQL=1)
endif()
endif()
diff --git a/cmake/modules/FindNFS.cmake b/cmake/modules/FindNFS.cmake
index 646ee33c84..b304bf345f 100644
--- a/cmake/modules/FindNFS.cmake
+++ b/cmake/modules/FindNFS.cmake
@@ -41,7 +41,7 @@ endif()
if(NFS_FOUND)
set(NFS_LIBRARIES ${NFS_LIBRARY})
set(NFS_INCLUDE_DIRS ${NFS_INCLUDE_DIR})
- set(NFS_DEFINITIONS -DHAVE_LIBNFS=1)
+ set(NFS_DEFINITIONS -DHAS_FILESYSTEM_NFS=1)
if(NOT TARGET NFS::NFS)
add_library(NFS::NFS UNKNOWN IMPORTED)
@@ -51,7 +51,7 @@ if(NFS_FOUND)
endif()
set_target_properties(NFS::NFS PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${NFS_INCLUDE_DIR}"
- INTERFACE_COMPILE_DEFINITIONS HAVE_LIBNFS=1)
+ INTERFACE_COMPILE_DEFINITIONS HAS_FILESYSTEM_NFS=1)
endif()
endif()
diff --git a/cmake/modules/FindOpenGLES.cmake b/cmake/modules/FindOpenGLES.cmake
index 8e94e5c48a..fac21bc4e8 100644
--- a/cmake/modules/FindOpenGLES.cmake
+++ b/cmake/modules/FindOpenGLES.cmake
@@ -31,14 +31,24 @@ else()
set(OPENGLES_INCLUDE_DIR ${OPENGLES_gl_LIBRARY}/Headers)
endif()
+find_path(OPENGLES3_INCLUDE_DIR GLES3/gl3.h)
+
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(OpenGLES
REQUIRED_VARS OPENGLES_gl_LIBRARY OPENGLES_INCLUDE_DIR)
+find_path(OPENGLES3_INCLUDE_DIR GLES3/gl3.h
+ PATHS ${PC_OPENGLES_INCLUDEDIR})
+
if(OPENGLES_FOUND)
- set(OPENGLES_INCLUDE_DIRS ${OPENGLES_INCLUDE_DIR})
set(OPENGLES_LIBRARIES ${OPENGLES_gl_LIBRARY})
- set(OPENGLES_DEFINITIONS -DHAVE_LIBGLESV2)
+ if(OPENGLES3_INCLUDE_DIR)
+ set(OPENGLES_INCLUDE_DIRS ${OPENGLES_INCLUDE_DIR} ${OPENGLES3_INCLUDE_DIR})
+ set(OPENGLES_DEFINITIONS -DHAS_GLES=3)
+ mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES3_INCLUDE_DIR OPENGLES_gl_LIBRARY)
+ else()
+ set(OPENGLES_INCLUDE_DIRS ${OPENGLES_INCLUDE_DIR})
+ set(OPENGLES_DEFINITIONS -DHAS_GLES=2)
+ mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES_gl_LIBRARY)
+ endif()
endif()
-
-mark_as_advanced(OPENGLES_INCLUDE_DIR OPENGLES_gl_LIBRARY)
diff --git a/cmake/modules/FindOpenGLES3.cmake b/cmake/modules/FindOpenGLES3.cmake
deleted file mode 100644
index 394328d482..0000000000
--- a/cmake/modules/FindOpenGLES3.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
-#.rst:
-# FindOpenGLES3
-# ------------
-# Finds the OpenGLES3 library
-#
-# This will will define the following variables::
-#
-# OPENGLES3_FOUND - system has OpenGLES3
-# OPENGLES3_INCLUDE_DIRS - the OpenGLES3 include directory
-# OPENGLES3_DEFINITIONS - the OpenGLES3 definitions
-
-
-find_path(OPENGLES3_INCLUDE_DIR GLES3/gl3.h)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(OpenGLES3
- REQUIRED_VARS OPENGLES3_INCLUDE_DIR)
-
-if(OPENGLES3_FOUND)
- set(OPENGLES3_INCLUDE_DIRS ${OPENGLES3_INCLUDE_DIR})
- set(OPENGLES3_DEFINITIONS -DHAVE_LIBGLESV3)
-endif()
-
-mark_as_advanced(OPENGLES3_INCLUDE_DIR)
diff --git a/cmake/modules/FindOpenGl.cmake b/cmake/modules/FindOpenGl.cmake
index b8cff79daf..af1c433db6 100644
--- a/cmake/modules/FindOpenGl.cmake
+++ b/cmake/modules/FindOpenGl.cmake
@@ -37,7 +37,7 @@ find_package_handle_standard_args(OpenGl
if(OPENGL_FOUND)
set(OPENGL_INCLUDE_DIRS ${OPENGL_INCLUDE_DIR})
set(OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
- set(OPENGL_DEFINITIONS -DHAVE_LIBGL=1)
+ set(OPENGL_DEFINITIONS -DHAS_GL=1)
endif()
mark_as_advanced(OPENGL_INCLUDE_DIR OPENGL_gl_LIBRARY OPENGL_glu_LIBRARY)
diff --git a/cmake/modules/FindPlist.cmake b/cmake/modules/FindPlist.cmake
index 862da4658e..0664c10ddc 100644
--- a/cmake/modules/FindPlist.cmake
+++ b/cmake/modules/FindPlist.cmake
@@ -41,7 +41,7 @@ endif()
if(PLIST_FOUND)
set(PLIST_LIBRARIES ${PLIST_LIBRARY})
set(PLIST_INCLUDE_DIRS ${PLIST_INCLUDE_DIR})
- set(PLIST_DEFINITIONS -DHAVE_LIBPLIST=1)
+ set(PLIST_DEFINITIONS -DHAS_AIRPLAY=1)
if(NOT TARGET Plist::Plist)
add_library(Plist::Plist UNKNOWN IMPORTED)
@@ -51,7 +51,7 @@ if(PLIST_FOUND)
endif()
set_target_properties(Plist::Plist PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${PLIST_INCLUDE_DIR}"
- INTERFACE_COMPILE_DEFINITIONS HAVE_LIBPLIST=1)
+ INTERFACE_COMPILE_DEFINITIONS HAS_AIRPLAY=1)
endif()
endif()
diff --git a/cmake/modules/FindSSH.cmake b/cmake/modules/FindSSH.cmake
index 538c699a2d..ee65210606 100644
--- a/cmake/modules/FindSSH.cmake
+++ b/cmake/modules/FindSSH.cmake
@@ -33,14 +33,14 @@ find_package_handle_standard_args(SSH
if(SSH_FOUND)
set(SSH_LIBRARIES ${SSH_LIBRARY})
set(SSH_INCLUDE_DIRS ${SSH_INCLUDE_DIR})
- set(SSH_DEFINITIONS -DHAVE_LIBSSH=1)
+ set(SSH_DEFINITIONS -DHAS_FILESYSTEM_SFTP=1)
if(NOT TARGET SSH::SSH)
add_library(SSH::SSH UNKNOWN IMPORTED)
set_target_properties(SSH::SSH PROPERTIES
IMPORTED_LOCATION "${SSH_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${SSH_INCLUDE_DIR}"
- INTERFACE_COMPILE_DEFINITIONS HAVE_LIBSSH=1)
+ INTERFACE_COMPILE_DEFINITIONS HAS_FILESYSTEM_SFTP=1)
endif()
endif()
diff --git a/cmake/modules/FindShairplay.cmake b/cmake/modules/FindShairplay.cmake
index 87d3107f60..699fb7a740 100644
--- a/cmake/modules/FindShairplay.cmake
+++ b/cmake/modules/FindShairplay.cmake
@@ -46,7 +46,7 @@ endif()
if(SHAIRPLAY_FOUND)
set(SHAIRPLAY_LIBRARIES ${SHAIRPLAY_LIBRARY})
set(SHAIRPLAY_INCLUDE_DIRS ${SHAIRPLAY_INCLUDE_DIR})
- set(SHAIRPLAY_DEFINITIONS -DHAVE_LIBSHAIRPLAY=1)
+ set(SHAIRPLAY_DEFINITIONS -DHAS_AIRTUNES=1)
if(NOT TARGET Shairplay::Shairplay)
add_library(Shairplay::Shairplay UNKNOWN IMPORTED)
@@ -56,7 +56,7 @@ if(SHAIRPLAY_FOUND)
endif()
set_target_properties(Shairplay::Shairplay PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${SHAIRPLAY_INCLUDE_DIR}"
- INTERFACE_COMPILE_DEFINITIONS HAVE_LIBSHAIRPLAY=1)
+ INTERFACE_COMPILE_DEFINITIONS HAS_AIRTUNES=1)
endif()
endif()
diff --git a/cmake/modules/FindSmbClient.cmake b/cmake/modules/FindSmbClient.cmake
index 6455cce3a1..9a8b197483 100644
--- a/cmake/modules/FindSmbClient.cmake
+++ b/cmake/modules/FindSmbClient.cmake
@@ -33,14 +33,14 @@ find_package_handle_standard_args(SmbClient
if(SMBCLIENT_FOUND)
set(SMBCLIENT_LIBRARIES ${SMBCLIENT_LIBRARY})
set(SMBCLIENT_INCLUDE_DIRS ${SMBCLIENT_INCLUDE_DIR})
- set(SMBCLIENT_DEFINITIONS -DHAVE_LIBSMBCLIENT=1)
+ set(SMBCLIENT_DEFINITIONS -DHAS_FILESYSTEM_SMB=1)
if(NOT TARGET SmbClient::SmbClient)
add_library(SmbClient::SmbClient UNKNOWN IMPORTED)
set_target_properties(SmbClient::SmbClient PROPERTIES
IMPORTED_LOCATION "${SMBCLIENT_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${SMBCLIENT_INCLUDE_DIR}"
- INTERFACE_COMPILE_DEFINITIONS HAVE_LIBSMBCLIENT=1)
+ INTERFACE_COMPILE_DEFINITIONS HAS_FILESYSTEM_SMB=1)
endif()
endif()
diff --git a/cmake/platform/linux/gbm.cmake b/cmake/platform/linux/gbm.cmake
index 616cefb872..6a9165aaff 100644
--- a/cmake/platform/linux/gbm.cmake
+++ b/cmake/platform/linux/gbm.cmake
@@ -1,2 +1,2 @@
set(PLATFORM_REQUIRED_DEPS OpenGLES EGL GBM LibDRM)
-set(PLATFORM_OPTIONAL_DEPS VAAPI OpenGLES3)
+set(PLATFORM_OPTIONAL_DEPS VAAPI)
diff --git a/cmake/scripts/android/ArchSetup.cmake b/cmake/scripts/android/ArchSetup.cmake
index abce5efefa..03056fa223 100644
--- a/cmake/scripts/android/ArchSetup.cmake
+++ b/cmake/scripts/android/ArchSetup.cmake
@@ -33,6 +33,9 @@ else()
endif()
endif()
+# Additional SYSTEM_DEFINES
+list(APPEND SYSTEM_DEFINES -DHAS_ZEROCONF)
+
set(ENABLE_X11 OFF CACHE BOOL "" FORCE)
set(ENABLE_AML OFF CACHE BOOL "" FORCE)
set(ENABLE_OPTICAL OFF CACHE BOOL "" FORCE)
diff --git a/cmake/scripts/freebsd/ArchSetup.cmake b/cmake/scripts/freebsd/ArchSetup.cmake
index c4d639bd23..8ee78fc1a0 100644
--- a/cmake/scripts/freebsd/ArchSetup.cmake
+++ b/cmake/scripts/freebsd/ArchSetup.cmake
@@ -14,3 +14,6 @@ else()
message(WARNING "unknown CPU: ${CPU}")
endif()
endif()
+
+# Additional SYSTEM_DEFINES
+list(APPEND SYSTEM_DEFINES -DHAS_LINUX_NETWORK)
diff --git a/cmake/scripts/ios/ArchSetup.cmake b/cmake/scripts/ios/ArchSetup.cmake
index 91e6adde81..0808eb286b 100644
--- a/cmake/scripts/ios/ArchSetup.cmake
+++ b/cmake/scripts/ios/ArchSetup.cmake
@@ -21,6 +21,9 @@ else()
endif()
endif()
+# Additional SYSTEM_DEFINES
+list(APPEND SYSTEM_DEFINES -DHAS_LINUX_NETWORK -DHAS_ZEROCONF)
+
find_package(CXX11 REQUIRED)
list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${NATIVEPREFIX})
diff --git a/cmake/scripts/linux/ArchSetup.cmake b/cmake/scripts/linux/ArchSetup.cmake
index d332bad998..ee69c09eda 100644
--- a/cmake/scripts/linux/ArchSetup.cmake
+++ b/cmake/scripts/linux/ArchSetup.cmake
@@ -87,6 +87,9 @@ if(HAVE_MKOSTEMP)
list(APPEND ARCH_DEFINES "-DHAVE_MKOSTEMP=1" "-D_GNU_SOURCE")
endif()
+# Additional SYSTEM_DEFINES
+list(APPEND SYSTEM_DEFINES -DHAS_LINUX_NETWORK)
+
# Code Coverage
if(CMAKE_BUILD_TYPE STREQUAL Coverage)
set(COVERAGE_TEST_BINARY ${APP_NAME_LC}-test)
diff --git a/cmake/scripts/osx/ArchSetup.cmake b/cmake/scripts/osx/ArchSetup.cmake
index bfb7d52232..d0c5506b0d 100644
--- a/cmake/scripts/osx/ArchSetup.cmake
+++ b/cmake/scripts/osx/ArchSetup.cmake
@@ -22,6 +22,9 @@ else()
endif()
endif()
+# Additional SYSTEM_DEFINES
+list(APPEND SYSTEM_DEFINES -DHAS_LINUX_NETWORK -DHAS_SDL -DHAS_ZEROCONF)
+
find_package(CXX11 REQUIRED)
list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${NATIVEPREFIX})
diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake
index a598277237..8e4f61defd 100644
--- a/cmake/scripts/windows/ArchSetup.cmake
+++ b/cmake/scripts/windows/ArchSetup.cmake
@@ -42,6 +42,9 @@ if(${ARCH} STREQUAL win32)
list(APPEND SYSTEM_DEFINES $<$<CONFIG:Debug>:-D_ITERATOR_DEBUG_LEVEL=0>)
endif()
+# Additional SYSTEM_DEFINES
+list(APPEND SYSTEM_DEFINES -DHAS_IRSERVERSUITE -DHAS_WIN32_NETWORK -DHAS_FILESYSTEM_SMB)
+
# Make sure /FS is set for Visual Studio in order to prevent simultaneous access to pdb files.
if(CMAKE_GENERATOR MATCHES "Visual Studio")
set(CMAKE_CXX_FLAGS "/MP /FS ${CMAKE_CXX_FLAGS}")
diff --git a/cmake/scripts/windowsstore/ArchSetup.cmake b/cmake/scripts/windowsstore/ArchSetup.cmake
index 4b2de40f46..6c6622cb1b 100644
--- a/cmake/scripts/windowsstore/ArchSetup.cmake
+++ b/cmake/scripts/windowsstore/ArchSetup.cmake
@@ -64,6 +64,9 @@ set(SYSTEM_DEFINES -DNOMINMAX -DHAS_DX -D__STDC_CONSTANT_MACROS
-DUNICODE -D_UNICODE
$<$<CONFIG:Debug>:-DD3D_DEBUG_INFO>)
+# Additional SYSTEM_DEFINES
+list(APPEND SYSTEM_DEFINES -DHAS_IRSERVERSUITE -DHAS_WIN10_NETWORK)
+
# The /MP option enables /FS by default.
set(CMAKE_CXX_FLAGS "/MP ${CMAKE_CXX_FLAGS} /ZW /EHsc /await")
# Google Test needs to use shared version of runtime libraries