diff options
Diffstat (limited to 'intern/ghost/test')
| -rw-r--r-- | intern/ghost/test/CMakeLists.txt | 8 |
1 files changed, 0 insertions, 8 deletions
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} ) |