mirror of
				https://github.com/ciphervance/supercell-wx.git
				synced 2025-10-31 18:10:05 +00:00 
			
		
		
		
	Ensure the mesa-glu::mesa-glu target is used on Linux instead of OpenGL::GLU
(cherry picked from commit b0a8c6576dc29f46f3cea26fbd06966b713fb4e7)
This commit is contained in:
		
							parent
							
								
									f387e1e525
								
							
						
					
					
						commit
						ad8569532a
					
				
					 1 changed files with 7 additions and 1 deletions
				
			
		|  | @ -734,6 +734,13 @@ if (LINUX) | ||||||
|     target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::WaylandClient) |     target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::WaylandClient) | ||||||
| endif() | endif() | ||||||
| 
 | 
 | ||||||
|  | if (LINUX) | ||||||
|  |     find_package(mesa-glu REQUIRED) | ||||||
|  |     target_link_libraries(scwx-qt PUBLIC mesa-glu::mesa-glu) | ||||||
|  | else() | ||||||
|  |     target_link_libraries(scwx-qt PUBLIC OpenGL::GLU) | ||||||
|  | endif() | ||||||
|  | 
 | ||||||
| target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets | target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets | ||||||
|                                      Qt${QT_VERSION_MAJOR}::OpenGLWidgets |                                      Qt${QT_VERSION_MAJOR}::OpenGLWidgets | ||||||
|                                      Qt${QT_VERSION_MAJOR}::Multimedia |                                      Qt${QT_VERSION_MAJOR}::Multimedia | ||||||
|  | @ -753,7 +760,6 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets | ||||||
|                                      glad_gl_core_33 |                                      glad_gl_core_33 | ||||||
|                                      glm::glm |                                      glm::glm | ||||||
|                                      imgui |                                      imgui | ||||||
|                                      OpenGL::GLU |  | ||||||
|                                      qt6ct-common |                                      qt6ct-common | ||||||
|                                      qt6ct-widgets |                                      qt6ct-widgets | ||||||
|                                      SQLite::SQLite3 |                                      SQLite::SQLite3 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Dan Paulat
						Dan Paulat