CMake: updated build/install instructions for external third-party libs

TheMostDiligent · TheMostDiligent · commit 6633a5196fda · 2022-04-01T15:28:31.000-07:00
diff --git a/Graphics/GraphicsEngineVulkan/CMakeLists.txt b/Graphics/GraphicsEngineVulkan/CMakeLists.txt
@@ -254,6 +254,7 @@ elseif(PLATFORM_IOS OR PLATFORM_TVOS)
     find_library(METAL_LIBRARY Metal)
     find_library(QUARTZ_CORE QuartzCore)
     find_library(UI_KIT UIKit)
+    # Note that volk may be defined by external CMake, but we don't use it on iOS/tvOS
     list(APPEND PRIVATE_DEPENDENCIES ${MOLTENVK_LIBRARY} ${CORE_GRAPHICS} ${METAL_LIBRARY} ${QUARTZ_CORE} ${UI_KIT})
 elseif(PLATFORM_LINUX)
     list(APPEND PRIVATE_DEPENDENCIES volk::volk_headers)
diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
@@ -6,18 +6,16 @@ cmake_minimum_required (VERSION 3.6)
 # instead:
 set(CMAKE_POLICY_DEFAULT_CMP0063 NEW)
 
-if (GL_SUPPORTED AND (PLATFORM_WIN32 OR PLATFORM_LINUX OR PLATFORM_MACOS))
-    if (NOT TARGET GLEW::glew)
-        add_subdirectory(glew)
-        if (DILIGENT_INSTALL_CORE)
-            install(TARGETS glew-static
-                    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}/${DILIGENT_CORE_DIR}/$<CONFIG>"
-                    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/${DILIGENT_CORE_DIR}/$<CONFIG>"
-                    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}/${DILIGENT_CORE_DIR}/$<CONFIG>"
-            )
-        endif()
-        install(FILES glew/LICENSE.txt DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME GLEW-License.txt)
+if (GL_SUPPORTED AND (PLATFORM_WIN32 OR PLATFORM_LINUX OR PLATFORM_MACOS) AND (NOT TARGET GLEW::glew))
+    add_subdirectory(glew)
+    if (DILIGENT_INSTALL_CORE)
+        install(TARGETS glew-static
+                ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}/${DILIGENT_CORE_DIR}/$<CONFIG>"
+                LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/${DILIGENT_CORE_DIR}/$<CONFIG>"
+                RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}/${DILIGENT_CORE_DIR}/$<CONFIG>"
+        )
     endif()
+    install(FILES glew/LICENSE.txt DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME GLEW-License.txt)
 endif()
 
 if (VULKAN_SUPPORTED OR METAL_SUPPORTED)
@@ -28,8 +26,8 @@ if (VULKAN_SUPPORTED OR METAL_SUPPORTED)
         # Note that SPIRV-Headers_SOURCE_DIR variable is normally created by project(SPIRV-Headers)
         set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Headers")
         target_include_directories(SPIRV-Headers INTERFACE "${SPIRV-Headers_SOURCE_DIR}/include")
+        install(FILES "${SPIRV-Headers_SOURCE_DIR}/LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME SPIRV-Headers-License.txt)
     endif()
-    install(FILES "${SPIRV-Headers_SOURCE_DIR}/LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME SPIRV-Headers-License.txt)
 
     if (NOT TARGET Vulkan::Headers)
         # Manually add the Vulkan-Headers target as this is all we need and the
@@ -39,48 +37,45 @@ if (VULKAN_SUPPORTED OR METAL_SUPPORTED)
         set(Vulkan-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers")
         add_library(Vulkan::Headers ALIAS Vulkan-Headers)
         target_include_directories(Vulkan-Headers INTERFACE "${Vulkan-Headers_SOURCE_DIR}/include")
+        install(FILES "${Vulkan-Headers_SOURCE_DIR}/LICENSE.txt" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME Vulkan-Headers-License.txt)
     endif()
-    install(FILES "${Vulkan-Headers_SOURCE_DIR}/LICENSE.txt" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME Vulkan-Headers-License.txt)
 
     option(DILIGENT_NO_GLSLANG "Do NOT build glslang compiler" OFF)
     option(DILIGENT_IMPROVE_SPIRV_TOOLS_DEBUG_PERF "Enable some optimizations for SPIRV-Tools, glslang, SPIRV-Cross and related projects in debug build to improve performance" ON)
 
-    if (NOT (${DILIGENT_NO_GLSLANG} AND ${DILIGENT_NO_HLSL}))
-        if (NOT TARGET SPIRV-Tools-static)
-            set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip SPIRV tests")
-            set(SPIRV_BUILD_COMPRESSION OFF CACHE BOOL "Do not build SPIRV compressing codec")
-            set(SPIRV_SKIP_EXECUTABLES ON CACHE BOOL "Skip building SPIRV executable and tests along with the library")
-            set(SKIP_SPIRV_TOOLS_INSTALL ON CACHE BOOL "Skip SPIRV tools installation")
-            set(SPIRV_WERROR OFF CACHE BOOL "Do not enable error on warning")
-            if (${DILIGENT_IMPROVE_SPIRV_TOOLS_DEBUG_PERF})
-                set(SPIRV_CHECK_CONTEXT OFF CACHE BOOL "Do not check if the IR context is in a valid state")
-            endif()
-            set(CMAKE_MACOSX_RPATH TRUE)
-            add_subdirectory(SPIRV-Tools)
-            set_directory_root_folder("SPIRV-Tools" "DiligentCore/ThirdParty/SPIRV-Tools")
-            # We only need SPIRV-Tools-opt for glslang that also depends on SPIRV-Tools-static.
-            # Exclude all other targets from the build to save build time
-            set(SPIRV_TOOLS_EXCLUDE_TARGETS SPIRV-Tools-link SPIRV-Tools-lint SPIRV-Tools-reduce SPIRV-Tools-shared)
-            set_target_properties(${SPIRV_TOOLS_EXCLUDE_TARGETS} PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
+    if (NOT (${DILIGENT_NO_GLSLANG} AND ${DILIGENT_NO_HLSL}) AND (NOT TARGET SPIRV-Tools-static))
+        set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip SPIRV tests")
+        set(SPIRV_BUILD_COMPRESSION OFF CACHE BOOL "Do not build SPIRV compressing codec")
+        set(SPIRV_SKIP_EXECUTABLES ON CACHE BOOL "Skip building SPIRV executable and tests along with the library")
+        set(SKIP_SPIRV_TOOLS_INSTALL ON CACHE BOOL "Skip SPIRV tools installation")
+        set(SPIRV_WERROR OFF CACHE BOOL "Do not enable error on warning")
+        if (${DILIGENT_IMPROVE_SPIRV_TOOLS_DEBUG_PERF})
+            set(SPIRV_CHECK_CONTEXT OFF CACHE BOOL "Do not check if the IR context is in a valid state")
         endif()
+        set(CMAKE_MACOSX_RPATH TRUE)
+        add_subdirectory(SPIRV-Tools)
+        set_directory_root_folder("SPIRV-Tools" "DiligentCore/ThirdParty/SPIRV-Tools")
+        # We only need SPIRV-Tools-opt for glslang that also depends on SPIRV-Tools-static.
+        # Exclude all other targets from the build to save build time
+        set(SPIRV_TOOLS_EXCLUDE_TARGETS SPIRV-Tools-link SPIRV-Tools-lint SPIRV-Tools-reduce SPIRV-Tools-shared)
+        set_target_properties(${SPIRV_TOOLS_EXCLUDE_TARGETS} PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)
+
         set(THIRD_PARTY_LIBS SPIRV-Tools-static SPIRV-Tools-opt)
         install(FILES "${spirv-tools_SOURCE_DIR}/LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME SPIRV-Tools-License.txt)
     endif()
 
-    if (NOT ${DILIGENT_NO_GLSLANG})
-        if (NOT TARGET glslang)
-            set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "Do not build glslang binaries")
-            set(ENABLE_SPVREMAPPER OFF CACHE BOOL "Do not build SPIRV remapper")
-            set(SKIP_GLSLANG_INSTALL ON CACHE BOOL "Skip glslang installation")
-            set(ENABLE_CTEST OFF CACHE BOOL "Disable testing")
-            add_subdirectory(glslang)
-            set_directory_root_folder("glslang" "DiligentCore/ThirdParty/glslang")
-
-            # glslang "kindly" sets global CMAKE_DEBUG_POSTFIX to "d", which we have to unset now
-            unset(CMAKE_DEBUG_POSTFIX CACHE)
-        endif()
+    if (NOT ${DILIGENT_NO_GLSLANG} AND (NOT TARGET glslang))
+        set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "Do not build glslang binaries")
+        set(ENABLE_SPVREMAPPER OFF CACHE BOOL "Do not build SPIRV remapper")
+        set(SKIP_GLSLANG_INSTALL ON CACHE BOOL "Skip glslang installation")
+        set(ENABLE_CTEST OFF CACHE BOOL "Disable testing")
+        add_subdirectory(glslang)
+        set_directory_root_folder("glslang" "DiligentCore/ThirdParty/glslang")
+
+        # glslang "kindly" sets global CMAKE_DEBUG_POSTFIX to "d", which we have to unset now
+        unset(CMAKE_DEBUG_POSTFIX CACHE)
+
         list(APPEND THIRD_PARTY_LIBS GenericCodeGen glslang OGLCompiler OSDependent SPIRV HLSL MachineIndependent)
-        get_target_property(GLSLANG_SOURCE_DIR glslang SOURCE_DIR)
         install(FILES "${glslang_SOURCE_DIR}/LICENSE.txt" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME GLSLang-License.txt)
     endif()
 
@@ -100,14 +95,14 @@ if (VULKAN_SUPPORTED OR METAL_SUPPORTED)
         set(SPIRV_CROSS_NAMESPACE_OVERRIDE diligent_spirv_cross CACHE STRING "Override the namespace used in the C++ API.")
         add_subdirectory(SPIRV-Cross)
         set_directory_root_folder("SPIRV-Cross" "DiligentCore/ThirdParty/SPIRV-Cross")
-    endif()
 
-    list(APPEND THIRD_PARTY_LIBS spirv-cross-core)
-    if (METAL_SUPPORTED)
-        list(APPEND THIRD_PARTY_LIBS spirv-cross-msl spirv-cross-glsl)
-    endif()
+        list(APPEND THIRD_PARTY_LIBS spirv-cross-core)
+        if (METAL_SUPPORTED)
+            list(APPEND THIRD_PARTY_LIBS spirv-cross-msl spirv-cross-glsl)
+        endif()
 
-    install(FILES "${SPIRV-Cross_SOURCE_DIR}/LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME SPIRV-Cross-License.txt)
+        install(FILES "${SPIRV-Cross_SOURCE_DIR}/LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME SPIRV-Cross-License.txt)
+    endif()
 
     if (DILIGENT_INSTALL_CORE)
         install(TARGETS ${THIRD_PARTY_LIBS}
@@ -133,36 +128,33 @@ if (VULKAN_SUPPORTED OR METAL_SUPPORTED)
      )
 endif()
 
-if (VULKAN_SUPPORTED AND (PLATFORM_WIN32 OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_ANDROID))
-    if (NOT TARGET volk::volk)
-        set(VOLK_PULL_IN_VULKAN OFF)
-        set(VOLK_INSTALL OFF)
-        add_subdirectory(volk)
-        set_target_properties(volk
-        PROPERTIES
-            EXCLUDE_FROM_ALL 1
-            EXCLUDE_FROM_DEFAULT_BUILD 1
-            FOLDER "DiligentCore/ThirdParty/volk"
-        )
-    endif()
+if (VULKAN_SUPPORTED AND (PLATFORM_WIN32 OR PLATFORM_LINUX OR PLATFORM_MACOS OR PLATFORM_ANDROID) AND (NOT TARGET volk::volk))
+    set(VOLK_PULL_IN_VULKAN OFF)
+    set(VOLK_INSTALL OFF)
+    add_subdirectory(volk)
+    set_target_properties(volk
+    PROPERTIES
+        EXCLUDE_FROM_ALL 1
+        EXCLUDE_FROM_DEFAULT_BUILD 1
+        FOLDER "DiligentCore/ThirdParty/volk"
+    )
     install(FILES "${volk_SOURCE_DIR}/LICENSE.md" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME Volk-License.md)
 endif()
 
-if (${DILIGENT_BUILD_GOOGLE_TEST})
-    if (NOT TARGET gtest)
-        set(INSTALL_GTEST OFF CACHE BOOL "Do not install googletest")
-        set(BUILD_GMOCK OFF CACHE BOOL "Do not build gmock")
-        set(gtest_force_shared_crt ON CACHE BOOL "Use shared (DLL) run-time lib even when Google Test is built as static lib.")
-        add_subdirectory(googletest)
-        set_directory_root_folder("googletest" "DiligentCore/ThirdParty/googletest")
-        set_target_properties(gtest gtest_main PROPERTIES
-            CXX_VISIBILITY_PRESET hidden # -fvisibility=hidden
-            C_VISIBILITY_PRESET hidden # -fvisibility=hidden
-            VISIBILITY_INLINES_HIDDEN TRUE
-         )
-    endif()
+if ((${DILIGENT_BUILD_GOOGLE_TEST}) AND (NOT TARGET gtest))
+    set(INSTALL_GTEST OFF CACHE BOOL "Do not install googletest")
+    set(BUILD_GMOCK OFF CACHE BOOL "Do not build gmock")
+    set(gtest_force_shared_crt ON CACHE BOOL "Use shared (DLL) run-time lib even when Google Test is built as static lib.")
+    add_subdirectory(googletest)
+    set_directory_root_folder("googletest" "DiligentCore/ThirdParty/googletest")
+    set_target_properties(gtest gtest_main PROPERTIES
+        CXX_VISIBILITY_PRESET hidden # -fvisibility=hidden
+        C_VISIBILITY_PRESET hidden # -fvisibility=hidden
+        VISIBILITY_INLINES_HIDDEN TRUE
+        )
+
     get_target_property(GTEST_SOURCE_DIR gtest SOURCE_DIR)
-    install(FILES "${GTEST_SOURCE_DIR}/../LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME googletest-License.txt)
+    install(FILES "googletest/LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME googletest-License.txt)
 endif()
 
 if (NOT TARGET xxHash::xxhash)
@@ -171,8 +163,8 @@ if (NOT TARGET xxHash::xxhash)
     set(XXHASH_BUILD_ENABLE_INLINE_API OFF)
     add_subdirectory(xxHash/cmake_unofficial)
     set_directory_root_folder("xxHash/cmake_unofficial" "DiligentCore/ThirdParty/xxHash")
+    install(FILES "${xxHash_SOURCE_DIR}/../LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME xxHash-License.txt)
 endif()
-install(FILES "${xxHash_SOURCE_DIR}/../LICENSE" DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME xxHash-License.txt)
 
 install(FILES stb/stb_image_write_license.txt DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}")
 install(FILES DirectXShaderCompiler/LICENSE.TXT DESTINATION "Licenses/ThirdParty/${DILIGENT_CORE_DIR}" RENAME DXC-License.txt)
