Merge branch 'develop' into develop_maptiles

sgumhold · Jan 26, 2025 · 11b13e1 · 11b13e1
2 parents 1697ce4 + 1599c31
commit 11b13e1
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/3rd/fltk/CMakeLists.txt b/3rd/fltk/CMakeLists.txt
@@ -172,7 +172,7 @@ install(DIRECTORY include/. DESTINATION ${CGV_3RD_INCLUDE_DEST} FILES_MATCHING P
 add_library(fltk SHARED ${SOURCES})
 target_link_libraries(fltk
         ${X11_LIBRARIES}
-        OpenGL
+        OpenGL::GL
         glew
         jpeg
         png)
@@ -211,7 +211,7 @@ install(TARGETS fltk EXPORT cgv_3rd DESTINATION ${CGV_BIN_DEST})
 add_library(fltk_static STATIC ${SOURCES})
 target_link_libraries(fltk_static
         ${X11_LIBRARIES}
-        OpenGL
+        OpenGL::GL
         glew_static
         jpeg_static
         png_static)

diff --git a/3rd/glew/CMakeLists.txt b/3rd/glew/CMakeLists.txt
@@ -6,7 +6,7 @@ install(DIRECTORY GL DESTINATION ${CGV_3RD_INCLUDE_DEST} FILES_MATCHING PATTERN
 
 # Shared Library
 add_library(glew SHARED glew.c)
-target_link_libraries(glew OpenGL)
+target_link_libraries(glew OpenGL::GL)
 target_compile_definitions(glew PRIVATE GLEW_BUILD)
 target_include_directories(glew PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

diff --git a/libs/cgv_g2d/CMakeLists.txt b/libs/cgv_g2d/CMakeLists.txt
@@ -12,7 +12,7 @@ cgv_add_target(cgv_g2d
 	SHADER_SOURCES ${SHADERS}
 
 	DEPENDENCIES
-		OpenGL glew cgv_utils cgv_type cgv_data cgv_base cgv_signal cgv_math
+		cgv_utils cgv_type cgv_data cgv_base cgv_signal cgv_math
 		cgv_media cgv_render cgv_gui cg_msdf cgv_reflect_types cgv_gl
 )
 

diff --git a/libs/cgv_gl/CMakeLists.txt b/libs/cgv_gl/CMakeLists.txt
@@ -11,7 +11,7 @@ cgv_add_target(cgv_gl
 	PPP_SOURCES ${PPP_SOURCES}
 	SHADER_SOURCES ${SHADERS}
 	DEPENDENCIES
-		OpenGL OpenGL::GLU ${CGV_OGL_PLATFORM_DEPS} glew json cgv_utils cgv_type cgv_data cgv_base cgv_signal cgv_math
+		OpenGL::GL OpenGL::GLU ${CGV_OGL_PLATFORM_DEPS} glew json cgv_utils cgv_type cgv_data cgv_base cgv_signal cgv_math
 		cgv_media cgv_render cgv_gui cgv_reflect_types
 
 	OVERRIDE_SHARED_EXPORT_DEFINE CGV_RENDER_GL_EXPORTS

diff --git a/libs/cgv_post/CMakeLists.txt b/libs/cgv_post/CMakeLists.txt
@@ -10,7 +10,7 @@ cgv_add_target(cgv_post
 	HEADERS ${HEADERS}
 
 	DEPENDENCIES
-		OpenGL glew cgv_utils cgv_type cgv_data cgv_base cgv_signal
+		cgv_utils cgv_type cgv_data cgv_base cgv_signal
 		cgv_media cgv_render cgv_gui cgv_reflect_types cgv_gl
 )
 

diff --git a/libs/glsu/CMakeLists.txt b/libs/glsu/CMakeLists.txt
@@ -7,8 +7,8 @@ if (WIN32)
     target_sources(glsu PRIVATE glsu.def)
 endif()
 
-target_link_libraries(glsu OpenGL)
-target_link_libraries(glsu_static OpenGL)
+target_link_libraries(glsu OpenGL::GL)
+target_link_libraries(glsu_static OpenGL::GL)
 
 target_include_directories(glsu PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

diff --git a/tool/shader_test/CMakeLists.txt b/tool/shader_test/CMakeLists.txt
@@ -54,7 +54,7 @@ add_executable(shader_test
 
 target_link_libraries(shader_test
         ${X11_LIBRARIES}
-        OpenGL
+        OpenGL::GL
         ${CGV_OGL_PLATFORM_DEPS}
         glew
         fltk