diff options
Diffstat (limited to 'intern/ghost/test/CMakeLists.txt')
| -rw-r--r-- | intern/ghost/test/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt index e93832c9b4e..da387094619 100644 --- a/intern/ghost/test/CMakeLists.txt +++ b/intern/ghost/test/CMakeLists.txt @@ -203,8 +203,11 @@ target_link_libraries(gears_c glewmx_lib string_lib ${OPENGL_gl_LIBRARY} +<<<<<<< HEAD +======= ${OPENGL_glu_LIBRARY} ${CMAKE_DL_LIBS} +>>>>>>> master ${PLATFORM_LINKLIBS} ) @@ -218,8 +221,11 @@ target_link_libraries(gears_cpp glewmx_lib string_lib ${OPENGL_gl_LIBRARY} +<<<<<<< HEAD +======= ${OPENGL_glu_LIBRARY} ${CMAKE_DL_LIBS} +>>>>>>> master ${PLATFORM_LINKLIBS} ) @@ -250,7 +256,6 @@ target_link_libraries(multitest_c guardedalloc_lib wcwidth_lib ${OPENGL_gl_LIBRARY} - ${OPENGL_glu_LIBRARY} ${FREETYPE_LIBRARY} ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS} |