Fix Linux build

Author: Youssef Abukwaik

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.10)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -8,8 +8,15 @@ SET(PROJECT_VERSION_PATCH 0)
 
 project(ImStudio C CXX)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-include(glfw)
+if (WIN32 OR APPLE)
+    include(glfw)
+else()  # Linux
+    find_package(glfw3 REQUIRED)
+endif()
+
 find_package(OpenGL REQUIRED)
+find_package(Threads REQUIRED)
+
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 

cmake/glfw.cmake

@@ -30,36 +30,6 @@ else()
     set(GLFW_INCLUDE_DIR ${INSTALL_DIR}/include)
     set(GLFW_LIBRARIES
             ${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}glfw3${CMAKE_STATIC_LIBRARY_SUFFIX})
-
-    if(UNIX)
-        find_package(Threads REQUIRED)
-        find_package(X11 REQUIRED)
-
-        if(NOT X11_Xrandr_FOUND)
-            message(FATAL_ERROR "Xrandr library not found - required for GLFW")
-        endif()
-
-        #if(NOT X11_xf86vmode_FOUND)
-        #    message(FATAL_ERROR "xf86vmode library not found - required for GLFW")
-        #endif()
-
-        if(NOT X11_Xcursor_FOUND)
-            message(FATAL_ERROR "Xcursor library not found - required for GLFW")
-        endif()
-
-        if(NOT X11_Xinerama_FOUND)
-            message(FATAL_ERROR "Xinerama library not found - required for GLFW")
-        endif()
-
-        if(NOT X11_Xinput_FOUND)
-            message(FATAL_ERROR "Xinput library not found - required for GLFW")
-        endif()
-
-        list(APPEND GLFW_LIBRARIES
-                "${X11_Xrandr_LIB}" "${X11_Xxf86vm_LIB}" "${X11_Xcursor_LIB}"
-                "${X11_Xinerama_LIB}" "${X11_Xinput_LIB}"
-                "${CMAKE_THREAD_LIBS_INIT}" -lrt -ldl)
-    endif()
 endif()
 
 set(GLFW_INCLUDE_DIR ${GLFW_INCLUDE_DIR} CACHE STRING "")

src/CMakeLists.txt

@@ -22,9 +22,10 @@ target_link_libraries(${TARGET} PRIVATE ${IMGUI_LIBRARIES})
 target_link_libraries(${TARGET} PRIVATE ${GLFW_LIBRARIES})
 target_link_libraries(${TARGET} PRIVATE ${FMT_LIBRARIES})
 target_link_libraries(${TARGET} PRIVATE ${OPENGL_LIBRARIES})
+target_link_libraries(${TARGET} PRIVATE ${CMAKE_THREAD_LIBS_INIT})
 
 if(UNIX AND NOT APPLE)
-    install(TARGET ${TARGET} RUNTIME DESTINATION bin)
+    install(TARGETS ${TARGET} DESTINATION bin)
     install(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION share/${TARGET})
     install(FILES ${CMAKE_SOURCE_DIR}/README.md DESTINATION share/${TARGET})
 endif()