From fc348a563ecb515416a563b42c78a621428967f9 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 26 Mar 2018 14:59:55 +0200 Subject: Fix bad merge resolution from previous commit --- intern/ghost/test/CMakeLists.txt | 8 -------- 1 file changed, 8 deletions(-) (limited to 'intern/ghost/test') diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt index da387094619..0cec217630c 100644 --- a/intern/ghost/test/CMakeLists.txt +++ b/intern/ghost/test/CMakeLists.txt @@ -203,11 +203,7 @@ target_link_libraries(gears_c glewmx_lib string_lib ${OPENGL_gl_LIBRARY} -<<<<<<< HEAD -======= - ${OPENGL_glu_LIBRARY} ${CMAKE_DL_LIBS} ->>>>>>> master ${PLATFORM_LINKLIBS} ) @@ -221,11 +217,7 @@ target_link_libraries(gears_cpp glewmx_lib string_lib ${OPENGL_gl_LIBRARY} -<<<<<<< HEAD -======= - ${OPENGL_glu_LIBRARY} ${CMAKE_DL_LIBS} ->>>>>>> master ${PLATFORM_LINKLIBS} ) -- cgit v1.2.3