Preparing for Writeup

cmake/FindAssimp.cmake

@@ -55,7 +55,7 @@ else()
 	# Find library files
 	find_library(
 		ASSIMP_LIBRARY
-		NAMES libassimp${CMAKE_DEBUG_POSTFIX}.a
+		NAMES libassimp${CMAKE_DEBUG_POSTFIX}.so
 		PATHS
 			/usr/lib64
 			/usr/lib
@@ -66,22 +66,10 @@ else()
 			${ASSIMP_ROOT}/code
 		DOC "Assimp library file")
 
-	find_file(
-		ASSIMP_BINARY
-		NAMES libassimp${CMAKE_DEBUG_POSTFIX}.so
-		PATHS
-			/usr/lib64
-			/usr/lib
-			/usr/local/lib64
-			/usr/local/lib
-			/sw/lib
-			/opt/local/lib
-			${ASSIMP_ROOT}/code
-		DOC "The Assimp library")
 endif()
 
 # Handle REQUIRD argument, define *_FOUND variable
-find_package_handle_standard_args(assimp DEFAULT_MSG ASSIMP_INCLUDE_DIR ASSIMP_BINARY)
+find_package_handle_standard_args(assimp DEFAULT_MSG ASSIMP_INCLUDE_DIR ASSIMP_LIBRARY)
 
 # Define GLFW_LIBRARIES and GLFW_INCLUDE_DIRS
 if (ASSIMP_FOUND)

cmake/FindGLFW.cmake

@@ -68,23 +68,9 @@ else()
 			/opt/local/include
 		DOC "The directory where GL/glfw.h resides")
 
-	# Find library files
-	# Try to use static libraries
-	find_library(
-		GLFW_LIBRARY
-		NAMES libglfw3${CMAKE_DEBUG_POSTFIX}.a
-		PATHS
-			/usr/lib64
-			/usr/lib
-			/usr/local/lib64
-			/usr/local/lib
-			/sw/lib
-			/opt/local/lib
-			${GLFW_ROOT}/src
-		DOC "The GLFW library")
-	
+	# Find library files	
 	find_file(
-		GLFW_BINARY
+		GLFW_LIBRARY
 		NAMES libglfw${CMAKE_DEBUG_POSTFIX}.so
 		PATHS	
 			/usr/lib64
@@ -98,7 +84,7 @@ else()
 endif()
 
 # Handle REQUIRD argument, define *_FOUND variable
-find_package_handle_standard_args(GLFW DEFAULT_MSG GLFW_INCLUDE_DIR GLFW_LIBRARY GLFW_BINARY)
+find_package_handle_standard_args(GLFW DEFAULT_MSG GLFW_INCLUDE_DIR GLFW_LIBRARY)
 
 # Define GLFW_LIBRARIES and GLFW_INCLUDE_DIRS
 if (GLFW_FOUND)

cmake/FindSLANG.cmake

@@ -49,63 +49,32 @@ if (WIN32)
 		PATHS
             ${SLANG_BINARY_PATH})
 else()
-	set(SLANG_BINARY_PATH ${SLANG_ROOT}/bin/linux-${CMAKE_PLATFORM}/debug/)
+	set(SLANG_BINARY_PATH ${SLANG_ROOT}/bin/linux-${CMAKE_PLATFORM}/release/)
 	# Find include files
 	find_path(
 		SLANG_INCLUDE_DIR
 		NAMES slang.h
 		PATHS
-			/usr/include
-			/usr/local/include
-			/sw/include
-			/opt/local/include
 			${SLANG_ROOT}
 		DOC "The directory where GL/glfw.h resides")
-
-	find_library(
-		SLANG_LIBRARY
-		NAMES libcore.a
-		PATHS
-			/usr/include
-			/usr/local/include
-			/sw/include
-			/opt/local/include
-			${SLANG_BINARY_PATH}
-		DOC "The directory where GL/glfw.h resides")
-		
-	find_library(
-		SLANG_COMPILER
-		NAMES libcompiler-core.a
-		PATHS
-			/usr/include
-			/usr/local/include
-			/sw/include
-			/opt/local/include
-			${SLANG_BINARY_PATH}
-		DOC "The directory where GL/glfw.h resides")
 		
 	# Find library files
 	find_library(
-		SLANG_BINARY
+		SLANG_LIBRARY
 		NAMES libslang.so
 		PATHS
-			/usr/lib64
-			/usr/lib
-			/usr/local/lib64
-			/usr/local/lib
-			/sw/lib
-			/opt/local/lib
 			${SLANG_BINARY_PATH}
+		NO_DEFAULT_PATH
 		DOC "The SLANG library")
 endif()
 
 # Handle REQUIRD argument, define *_FOUND variable
-find_package_handle_standard_args(SLANG DEFAULT_MSG SLANG_INCLUDE_DIR SLANG_LIBRARY SLANG_BINARY)
+find_package_handle_standard_args(SLANG DEFAULT_MSG SLANG_INCLUDE_DIR SLANG_LIBRARY)
 
 # Define SLANG_LIBRARIES and SLANG_INCLUDE_DIRS
 if (SLANG_FOUND)
     set(SLANG_BINARIES ${SLANG_BINARY} ${SLANG_GLSLANG})
-	set(SLANG_LIBRARIES ${SLANG_LIBRARY} ${SLANG_COMPILER})
+	set(SLANG_LIBRARIES ${SLANG_LIBRARY})
 	set(SLANG_INCLUDE_DIRS ${SLANG_INCLUDE_DIR})
 endif()
 

cmake/SuperBuild.cmake

@@ -10,7 +10,7 @@ set(ASSIMP_BUILD_OVERALLS OFF CACHE INTERNAL "")
 set(ASSIMP_BUILD_ASSIMP_TOOLS OFF CACHE INTERNAL "")
 set(ASSIMP_INSTALL OFF CACHE INTERNAL "")
 set(ASSIMP_BUILD_ZLIB OFF CACHE INTERNAL "")
-set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "")
+set(BUILD_SHARED_LIBS ON CACHE INTERNAL "")
 
 add_subdirectory(${ASSIMP_ROOT} ${ASSIMP_ROOT})
 target_compile_definitions(assimp PRIVATE _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING)
@@ -59,13 +59,13 @@ set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL  "GLFW lib only" )
 set(GLFW_BUILD_TESTS OFF CACHE BOOL  "GLFW lib only" )
 set(GLFW_BUILD_DOCS OFF CACHE BOOL  "GLFW lib only" )
 set(GLFW_BUILD_INSTALL OFF CACHE BOOL  "GLFW lib only" )
-set(GLFW_VULKAN_STATIC ON CACHE BOOL "GLFW vulkan static")
+set(GLFW_VULKAN_STATIC OFF CACHE BOOL "GLFW vulkan static")
 
 add_subdirectory(${GLFW_ROOT} ${GLFW_ROOT})
 
 #--------------SLang------------------------------
 list(APPEND DEPENDENCIES slang)
-string(TOLOWER debug_${CMAKE_PLATFORM} SLANG_CONFIG)
+string(TOLOWER release_${CMAKE_PLATFORM} SLANG_CONFIG)
 if(WIN32)
 ExternalProject_Add(slang
 	SOURCE_DIR ${SLANG_ROOT}