Always use FetchContent

CMakeLists.txt

@@ -39,7 +39,7 @@ FetchContent_Declare(
   GIT_TAG master
 )
 
-macro(manual_download)
+# manual download
 set(BUILD_BULLET3 OFF CACHE BOOL "" FORCE)
 set(BUILD_BULLET3_DEMOS OFF CACHE BOOL "" FORCE)
 set(BUILD_BULLET2_DEMOS OFF CACHE BOOL "" FORCE)
@@ -60,7 +60,6 @@ macro(manual_download)
 FetchContent_MakeAvailable(glslang)
 
 set(CMAKE_FOLDER "")
-endmacro()
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" AND NOT IOS)
     message("macOS build detected!")
@@ -70,8 +69,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" AND NOT IOS)
     set(ENABLE_MACOS TRUE)
 
     set(CMAKE_XCODE_GENERATE_SCHEME OFF)
-
-    manual_download()
 endif()
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
@@ -80,8 +77,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
     set(ENABLE_METAL TRUE)
     set(ENABLE_DARWIN TRUE)
     set(ENABLE_IOS TRUE)
-
-    manual_download()
 endif()
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "tvOS")
@@ -90,8 +85,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "tvOS")
     set(ENABLE_METAL TRUE)
     set(ENABLE_DARWIN TRUE)
     set(ENABLE_TVOS TRUE)
-
-    manual_download()
 endif()
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
@@ -99,37 +92,14 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 
     set(ENABLE_WINDOWS ON)
     set(ENABLE_VULKAN ON)
-
-    manual_download()
 endif()
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "WindowsStore")
     message("UWP build detected!")
 
     set(ENABLE_UWP TRUE)
-
-    manual_download()
 endif()
 
-if(NOT TARGET spirv-cross-cpp)
-    find_package(spirv_cross_core REQUIRED)
-    find_package(spirv_cross_glsl REQUIRED)
-    find_package(spirv_cross_cpp REQUIRED)
-    find_package(spirv_cross_msl REQUIRED)
-    find_package(glslang REQUIRED)
-
-    set(CROSS_LIBS
-        glslang::glslang
-        glslang::SPIRV
-        glslang::OSDependent
-        glslang::OGLCompiler
-        glslang::HLSL
-        spirv-cross-core
-        spirv-cross-glsl
-        spirv-cross-cpp
-        spirv-cross-msl
-    )
-else()
 set(CROSS_LIBS
     spirv-cross-core
     spirv-cross-glsl
@@ -138,8 +108,6 @@ else()
     glslang
     SPIRV
 )
-endif()
-
 
 add_subdirectory(extern)
 add_subdirectory(platforms)