Fixing linux build kind of

2021-10-13 15:20:30 +02:00
parent 99760724cd
commit 59b262777c
18 changed files with 111 additions and 100 deletions
@@ -62,33 +62,18 @@ else()
 	# Find include files
 	find_path(
 		NSAM_INCLUDE_DIR
-		NAMES NSAM/nsam3.h
+		NAMES GFSDK_Aftermath.h
 		PATHS
 			/usr/include
 			/usr/local/include
 			/sw/include
 			/opt/local/include
+			${NSAM_ROOT}/include
 		DOC "The directory where GL/nsam.h resides")

-	# Find library files
-	# Try to use static libraries
-	#find_library(
-	#	NSAM_LIBRARY
-	#	NAMES nsam3
-	#	PATHS
-	#		/usr/lib64
-	#		/usr/lib
-	#		/usr/local/lib64
-	#		/usr/local/lib
-	#		/sw/lib
-	#		/opt/local/lib
-	#		${NSAM_ROOT}/lib
-	#	DOC "The NSAM library")
-	set(NSAM_LIBRARY "")
-
 	find_file(
 		NSAM_BINARY
-		NAMES libnsam${CMAKE_DEBUG_POSTFIX}.so
+		NAMES libGFSDK_Aftermath_Lib.${CMAKE_PLATFORM}.so
 		PATHS	
 			/usr/lib64
 			/usr/lib
@@ -96,8 +81,8 @@ else()
 			/usr/local/lib
 			/sw/lib
 			/opt/local/lib
-			${NSAM_ROOT}/src
-	)
+			${NSAM_ROOT}/lib
+		PATH_SUFFIXES x64 x86)
 endif()

 # Handle REQUIRD argument, define *_FOUND variable
@@ -55,6 +55,19 @@ else()
 	# Find library files
 	find_library(
 		ASSIMP_LIBRARY
+		NAMES libassimp${CMAKE_DEBUG_POSTFIX}.a
+		PATHS
+			/usr/lib64
+			/usr/lib
+			/usr/local/lib64
+			/usr/local/lib
+			/sw/lib
+			/opt/local/lib
+			${ASSIMP_ROOT}/code
+		DOC "Assimp library file")
+
+	find_file(
+		ASSIMP_BINARY
 		NAMES libassimp${CMAKE_DEBUG_POSTFIX}.so
 		PATHS
 			/usr/lib64
@@ -63,12 +76,12 @@ else()
 			/usr/local/lib
 			/sw/lib
 			/opt/local/lib
-			${ASSIMP_ROOT}/bin
+			${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_LIBRARY)
+find_package_handle_standard_args(assimp DEFAULT_MSG ASSIMP_INCLUDE_DIR ASSIMP_BINARY)

 # Define GLFW_LIBRARIES and GLFW_INCLUDE_DIRS
 if (ASSIMP_FOUND)
@@ -70,20 +70,19 @@ else()

 	# Find library files
 	# Try to use static libraries
-	#find_library(
-	#	GLFW_LIBRARY
-	#	NAMES glfw3
-	#	PATHS
-	#		/usr/lib64
-	#		/usr/lib
-	#		/usr/local/lib64
-	#		/usr/local/lib
-	#		/sw/lib
-	#		/opt/local/lib
-	#		${GLFW_ROOT}/lib
-	#	DOC "The GLFW library")
-	set(GLFW_LIBRARY "")
-
+	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_file(
 		GLFW_BINARY
 		NAMES libglfw${CMAKE_DEBUG_POSTFIX}.so
@@ -99,7 +98,7 @@ else()
 endif()

 # Handle REQUIRD argument, define *_FOUND variable
-find_package_handle_standard_args(GLFW DEFAULT_MSG GLFW_INCLUDE_DIR GLFW_BINARY)
+find_package_handle_standard_args(GLFW DEFAULT_MSG GLFW_INCLUDE_DIR GLFW_LIBRARY GLFW_BINARY)

 # Define GLFW_LIBRARIES and GLFW_INCLUDE_DIRS
 if (GLFW_FOUND)
@@ -47,6 +47,17 @@ else()
 			/opt/local/include
 			${KTX_ROOT}
 		DOC "The directory where KTX/ktx.h resides")
+
+	find_library(
+		KTX_LIBRARY
+		NAMES libktx${CMAKE_DEBUG_POSTFIX}.so
+		PATHS
+			/usr/include
+			/usr/local/include
+			/sw/include
+			/opt/local/include
+			${KTX_ROOT}
+		DOC "The directory where KTX/libktx.so resides")
 endif()

 # Handle REQUIRD argument, define *_FOUND variable
@@ -49,7 +49,7 @@ if (WIN32)
 		PATHS
            ${SLANG_BINARY_PATH})
 else()
-	set(SLANG_BINARY_PATH ${SLANG_ROOT}/bin/linux-${CMAKE_PLATFORM}/release/)
+	set(SLANG_BINARY_PATH ${SLANG_ROOT}/bin/linux-${CMAKE_PLATFORM}/debug/)
 	# Find include files
 	find_path(
 		SLANG_INCLUDE_DIR
@@ -62,9 +62,29 @@ else()
 			${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
-	# Try to use static libraries
-	set(SLANG_LIBRARY "")
 	find_library(
 		SLANG_BINARY
 		NAMES libslang.so
@@ -77,28 +97,15 @@ else()
 			/opt/local/lib
 			${SLANG_BINARY_PATH}
 		DOC "The SLANG library")
-	
-	find_file(
-		SLANG_GLSLANG
-		NAMES libslang-glslang.so
-		PATHS	
-			/usr/lib64
-			/usr/lib
-			/usr/local/lib64
-			/usr/local/lib
-			/sw/lib
-			/opt/local/lib
-			${SLANG_BINARY_PATH}
-	)
 endif()

 # Handle REQUIRD argument, define *_FOUND variable
-find_package_handle_standard_args(SLANG DEFAULT_MSG SLANG_INCLUDE_DIR SLANG_BINARY SLANG_GLSLANG)
+find_package_handle_standard_args(SLANG DEFAULT_MSG SLANG_INCLUDE_DIR SLANG_LIBRARY SLANG_BINARY)

 # Define SLANG_LIBRARIES and SLANG_INCLUDE_DIRS
 if (SLANG_FOUND)
    set(SLANG_BINARIES ${SLANG_BINARY} ${SLANG_GLSLANG})
-	set(SLANG_LIBRARIES ${SLANG_LIBRARY})
+	set(SLANG_LIBRARIES ${SLANG_LIBRARY} ${SLANG_COMPILER})
 	set(SLANG_INCLUDE_DIRS ${SLANG_INCLUDE_DIR})
 endif()

@@ -10,15 +10,15 @@ 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 ON CACHE INTERNAL "")
+set(BUILD_SHARED_LIBS OFF CACHE INTERNAL "")

 add_subdirectory(${ASSIMP_ROOT} ${ASSIMP_ROOT})
 target_compile_definitions(assimp PRIVATE _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING)
-#if(WIN32)
-#	target_compile_options(assimp PRIVATE /WX-)
-#else()
-#	target_compile_options(assimp PRIVATE -Wno-error)
-#endif()
+if(WIN32)
+	target_compile_options(assimp PRIVATE /WX-)
+else()
+	target_compile_options(assimp PRIVATE -Wno-error -fPIC)
+endif()
 #-------------BOOST----------------
 list(APPEND DEPENDENCIES boost)
 if(WIN32)
@@ -30,7 +30,7 @@ ExternalProject_Add(boost
 	SOURCE_DIR ${BOOST_ROOT}
 	UPDATE_COMMAND ""
 	CONFIGURE_COMMAND ./bootstrap.${BOOTSTRAP_EXTENSION} --with-libraries=serialization,test
-	BUILD_COMMAND ./b2 link=static -d0
+	BUILD_COMMAND ./b2 -d0
 	BUILD_IN_SOURCE 1
 	INSTALL_COMMAND "")

@@ -59,12 +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")

 add_subdirectory(${GLFW_ROOT} ${GLFW_ROOT})

 #--------------SLang------------------------------
 list(APPEND DEPENDENCIES slang)
-string(TOLOWER release_${CMAKE_PLATFORM} SLANG_CONFIG)
+string(TOLOWER debug_${CMAKE_PLATFORM} SLANG_CONFIG)
 if(WIN32)
 ExternalProject_Add(slang
 	SOURCE_DIR ${SLANG_ROOT}
@@ -72,19 +73,13 @@ ExternalProject_Add(slang
 	CONFIGURE_COMMAND ""
 	BUILD_COMMAND msbuild slang.sln -p:Configuration=Release -p:Platform=${CMAKE_PLATFORM}
 	INSTALL_COMMAND "")
-
-	set(SLANG_LIB_PATH ${SLANG_ROOT}/${SLANG_LIB_PATH})
 elseif(UNIX)
 ExternalProject_Add(slang
 	SOURCE_DIR ${SLANG_ROOT}
 	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}
+	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 "")
-	
-	string(TOLOWER bin/linux-${CMAKE_PLATFORM}/Release/libslang.so SLANG_BINARY)
-	string(TOLOWER bin/linux-${CMAKE_PLATFORM}/Release/libslang-glslang.so SLANG_GLSLANG)
-	set(SLANG_LIB_PATH)
 endif()