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
@@ -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)