diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-26 15:59:55 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-26 15:59:55 +0300 |
| commit | fc348a563ecb515416a563b42c78a621428967f9 (patch) | |
| tree | 20ae9566c7811e14a35d2bb17afd445ead177871 /intern/ghost/test | |
| parent | 21aca14e43326ea9af45f1e848ebca52808f8470 (diff) | |
Fix bad merge resolution from previous commit
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} ) |