Adrian Schröter
98a18ab4dc
Fix build in factory + aarch64 linking OBS-URL: https://build.opensuse.org/request/show/1171944 OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=174
51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
--- a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
|
|
+++ b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake
|
|
@@ -187,7 +187,7 @@ macro(PrintFinalReport)
|
|
else()
|
|
simple(Freetype "disabled")
|
|
endif()
|
|
- simple(OpenGL_Lib [${OPENGL_gl_LIBRARY}])
|
|
+ simple(OpenGL_Lib [${OPENGL_gl_LIBRARY}][${OPENGL_LIBRARY}])
|
|
simple(OpenGLU_Lib [${OPENGL_glu_LIBRARY}])
|
|
simple(OpenGLU_Incl [${OPENGL_INCLUDE_DIR}])
|
|
simple(Coin3D "${COIN3D_VERSION} [${COIN3D_LIBRARIES}] [${COIN3D_INCLUDE_DIRS}]")
|
|
--- a/src/Gui/CMakeLists.txt
|
|
+++ b/src/Gui/CMakeLists.txt
|
|
@@ -68,6 +68,7 @@ if(MSVC)
|
|
FreeCADApp
|
|
${COIN3D_LIBRARIES}
|
|
${OPENGL_gl_LIBRARY}
|
|
+ ${OPENGL_LIBRARY}
|
|
)
|
|
|
|
if(FREECAD_USE_3DCONNEXION)
|
|
@@ -82,6 +83,7 @@ else(MSVC)
|
|
${COIN3D_LIBRARIES}
|
|
${Boost_LIBRARIES}
|
|
${OPENGL_gl_LIBRARY}
|
|
+ ${OPENGL_LIBRARY}
|
|
${3DCONNEXION_LINKFLAGS}
|
|
)
|
|
endif(MSVC)
|
|
--- a/src/Gui/Quarter/CMakeLists.txt
|
|
+++ b/src/Gui/Quarter/CMakeLists.txt
|
|
@@ -23,7 +23,7 @@ IF (Spacenav_FOUND)
|
|
ENDIF(Spacenav_FOUND)
|
|
|
|
|
|
-SET(AllLibs ${Coin_LIBRARY} ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${Extra_libraries})
|
|
+SET(AllLibs ${Coin_LIBRARY} ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_LIBRARY} ${Extra_libraries})
|
|
|
|
|
|
|
|
--- a/src/Mod/Mesh/Gui/CMakeLists.txt
|
|
+++ b/src/Mod/Mesh/Gui/CMakeLists.txt
|
|
@@ -17,6 +17,7 @@ endif(MSVC)
|
|
set(MeshGui_LIBS
|
|
${Boost_LIBRARIES}
|
|
${OPENGL_glu_LIBRARY}
|
|
+ ${OPENGL_LIBRARY}
|
|
Mesh
|
|
FreeCADGui
|
|
)
|