Removing slang temporarily

cmake/FindKTX.cmake

@@ -0,0 +1,63 @@
+#
+# Find KTX
+#
+# Try to find KTX library.
+# This module defines the following variables:
+# - KTX_INCLUDE_DIRS
+# - KTX_LIBRARIES
+# - KTX_FOUND
+#
+# The following variables can be set as arguments for the module.
+# - KTX_ROOT : Root library directory of KTX
+# - KTX_USE_STATIC_LIBS : Specifies to use static version of KTX library (Windows only)
+#
+#
+
+# Additional modules
+include(FindPackageHandleStandardArgs)
+
+if (WIN32)
+	# Find include files
+	find_path(
+		KTX_INCLUDE_DIR
+		NAMES ktx.h
+		PATHS
+			$ENV{PROGRAMFILES}/include
+			${KTX_ROOT}/include
+		DOC "The directory where ktx.h resides")
+
+	# Find library files
+	find_library(
+		KTX_LIBRARY
+		NAMES ktx${CMAKE_DEBUG_POSTFIX}.lib
+		PATHS
+			$ENV{PROGRAMFILES}/lib
+			${KTX_ROOT}
+			${KTX_ROOT}/lib
+		PATH_SUFFIXES Debug Release)
+else()
+	# Find include files
+	find_path(
+		KTX_INCLUDE_DIR
+		NAMES ktx.h
+		PATHS
+			/usr/include
+			/usr/local/include
+			/sw/include
+			/opt/local/include
+			${KTX_ROOT}
+		DOC "The directory where KTX/ktx.h resides")
+endif()
+
+# Handle REQUIRD argument, define *_FOUND variable
+find_package_handle_standard_args(KTX DEFAULT_MSG KTX_INCLUDE_DIR KTX_LIBRARY)
+
+# Define KTX_LIBRARIES and KTX_INCLUDE_DIRS
+if (KTX_FOUND)
+	set(KTX_INCLUDE_DIRS ${KTX_INCLUDE_DIR})
+	set(KTX_LIBRARIES ${KTX_LIBRARY})
+endif()
+
+# Hide some variables
+mark_as_advanced(KTX_INCLUDE_DIR)
+mark_as_advanced(KTX_LIBRARY)

cmake/FindSTB.cmake

@@ -11,9 +11,6 @@
 # - STB_ROOT : Root library directory of STB
 # - STB_USE_STATIC_LIBS : Specifies to use static version of STB library (Windows only)
 #
-# References:
-# - https://github.com/progschj/OpenGL-Examples/blob/master/cmake_modules/FindSTB.cmake
-# - https://bitbucket.org/Ident8/cegui-mk2-opengl3-renderer/src/befd47200265/cmake/FindSTB.cmake
 #
 
 # Additional modules
@@ -26,7 +23,7 @@ if (WIN32)
 		NAMES stb.h
 		PATHS
 			$ENV{PROGRAMFILES}/include
-			${STB_ROOT}
+			${STB_ROOT}/include
 		DOC "The directory where STB/stb.h resides")
 else()
 	# Find include files

cmake/SuperBuild.cmake

@@ -37,6 +37,11 @@ ExternalProject_Add(boost
 list (APPEND EXTRA_CMAKE_ARGS
 	-DBoost_NO_SYSTEM_PATHS=OFF)
 
+#-----------------KTX----------------------------
+list(APPEND DEPENDENCIES ktx)
+
+add_subdirectory(${KTX_ROOT} ${KTX_ROOT})
+
 #--------------------JSON------------------
 list(APPEND DEPENDENCIES nlohmann_json)
 set(JSON_MultipleHeaders ON CACHE INTERNAL "")
@@ -61,16 +66,16 @@ string(TOLOWER release_${CMAKE_PLATFORM} SLANG_CONFIG)
 if(WIN32)
 ExternalProject_Add(slang
 	SOURCE_DIR ${SLANG_ROOT}
-	BINARY_DIR ${CMAKE_BINARY_DIR}/lib
-	CONFIGURE_COMMAND devenv /upgrade ${SLANG_ROOT}/source/slang/slang.vcxproj
-	BUILD_COMMAND msbuild -p:Configuration=Release -p:WarningLevel=0 -p:Platform=${CMAKE_PLATFORM} -p:WindowsTargetPlatformVersion=10.0 ${SLANG_ROOT}/source/slang/slang.vcxproj
+	BINARY_DIR ${SLANG_ROOT}
+	CONFIGURE_COMMAND ""
+	BUILD_COMMAND msbuild slang.sln
 	INSTALL_COMMAND "")
 
 	set(SLANG_LIB_PATH ${SLANG_ROOT}/${SLANG_LIB_PATH})
 elseif(UNIX)
 ExternalProject_Add(slang
 	SOURCE_DIR ${SLANG_ROOT}
-	BINARY_DIR ${CMAKE_BINARY_DIR}/lib
+	BINARY_DIR ${SLANG_ROOT}/lib
 	CONFIGURE_COMMAND ${CMAKE_SOURCE_DIR}/premake5 --file=${CMAKE_SOURCE_DIR}/external/slang/premake5.lua gmake2 --build-location=build.linux
 	BUILD_COMMAND make -C ${CMAKE_SOURCE_DIR}/external/slang/build.linux config=${SLANG_CONFIG}
 	INSTALL_COMMAND "")
@@ -80,16 +85,6 @@ ExternalProject_Add(slang
 	set(SLANG_LIB_PATH)
 endif()
 
-#----------------SPIR-V-CROSS--------------------
-# list(APPEND DEPENDENCIES spirv-cross-reflect)
-# set(SPIRV_CROSS_ENABLE_HLSL OFF CACHE BOOL "")
-# set(SPIRV_CROSS_ENABLE_TESTS OFF CACHE BOOL "")
-# set(SPIRV_CROSS_CLI OFF CACHE BOOL "")
-# set(SPIRV_CROSS_ENABLE_C_API OFF CACHE BOOL "")
-# set(SPIRV_CROSS_ENABLE_UTIL OFF CACHE BOOL "")
-# set(SPIRV_CROSS_SKIP_INSTALL ON CACHE BOOL "")
-# add_subdirectory(${SPIRV_ROOT})
-
 
 #-----------------SeeleEngine--------------------
 ExternalProject_Add(SeeleEngine