Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'intern/ghost/test/CMakeLists.txt')
-rw-r--r--intern/ghost/test/CMakeLists.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt
index ef6e8915871..da387094619 100644
--- a/intern/ghost/test/CMakeLists.txt
+++ b/intern/ghost/test/CMakeLists.txt
@@ -203,6 +203,11 @@ target_link_libraries(gears_c
glewmx_lib
string_lib
${OPENGL_gl_LIBRARY}
+<<<<<<< HEAD
+=======
+ ${OPENGL_glu_LIBRARY}
+ ${CMAKE_DL_LIBS}
+>>>>>>> master
${PLATFORM_LINKLIBS}
)
@@ -216,6 +221,11 @@ target_link_libraries(gears_cpp
glewmx_lib
string_lib
${OPENGL_gl_LIBRARY}
+<<<<<<< HEAD
+=======
+ ${OPENGL_glu_LIBRARY}
+ ${CMAKE_DL_LIBS}
+>>>>>>> master
${PLATFORM_LINKLIBS}
)
@@ -248,5 +258,6 @@ target_link_libraries(multitest_c
${OPENGL_gl_LIBRARY}
${FREETYPE_LIBRARY}
${ZLIB_LIBRARIES}
+ ${CMAKE_DL_LIBS}
${PLATFORM_LINKLIBS}
)