From 5ee55d2225de71cd78098f6c495fc249cb938c54 Mon Sep 17 00:00:00 2001
From: Tristan Walter <twalter@orn.mpg.de>
Date: Sun, 18 Oct 2020 04:03:34 +0200
Subject: [PATCH] OPENGL2
---
Application/CMakeLists.txt | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/Application/CMakeLists.txt b/Application/CMakeLists.txt
index a310aea..6bf4daa 100644
--- a/Application/CMakeLists.txt
+++ b/Application/CMakeLists.txt
@@ -84,6 +84,19 @@ else()
set(BUILD_SHARED_LIBS OFF)
endif()
+if(TREX_BUILD_GLFW OR UNIX)
+ if(WIN32)
+ find_package(OpenGL REQUIRED)
+ message(STATUS "OpenGL library ${OPENGL_LIBRARY}")
+ elseif(UNIX AND NOT APPLE)
+ find_package(OpenGL REQUIRED)
+ SET(OPENGL_LIBRARY OpenGL::GL)
+ message(STATUS "OpenGL library ${OPENGL_LIBRARY}")
+ else()
+ find_library(OPENGL_LIBRARY OpenGL)
+ endif()
+endif()
+
if(APPLE)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-undefined,error -framework IOKit -framework CoreFoundation -framework CoreGraphics -framework CoreVideo -framework OpenCL -framework Cocoa -framework AppKit -framework AVKit -framework AVFoundation -framework CoreMedia -framework QuartzCore -framework Accelerate")
@@ -950,19 +963,6 @@ foreach(dir ${dirs})
message(STATUS "dir='${dir}'")
endforeach()
-if(TREX_BUILD_GLFW OR UNIX)
- if(WIN32)
- find_package(OpenGL REQUIRED)
- message(STATUS "OpenGL library ${OPENGL_LIBRARY}")
- elseif(UNIX AND NOT APPLE)
- find_package(OpenGL REQUIRED)
- SET(OPENGL_LIBRARY OpenGL::GL)
- message(STATUS "OpenGL library ${OPENGL_LIBRARY}")
- else()
- find_library(OPENGL_LIBRARY OpenGL)
- endif()
-endif()
-
add_subdirectory(src)
--
GitLab