diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-01-08 19:17:40 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-01-08 19:17:40 +0300 |
| commit | e02af840e1fbafd068d527ade70146141ab16946 (patch) | |
| tree | 0a79ad0061e80b6f4b9a6bcd320adf28f81fcb75 /build_files | |
| parent | 60e70c0c6014e51954473e075a7679ad24648acd (diff) | |
Fix gtest linking on ubuntu and do minor cleanup.
Generally for build systems, libraries that do not depend on other
libraries, such as system libraries, OpenGL etc always go at the end.
We could even get rid of some duplicate dependency libraries here but
auto duplication by build systems and differences between OSs make this
difficult.
GTest still duplicates all libraries twice to solve some issues which is
weird (maybe libs are not sorted correctly for some reason? needs
investigation)
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/Modules/GTestTesting.cmake | 1 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 17 |
2 files changed, 6 insertions, 12 deletions
diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index c8719de64ad..fd0379b8f78 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -28,7 +28,6 @@ macro(BLENDER_SRC_GTEST NAME SRC EXTRA_LIBS) add_executable(${NAME}_test ${SRC}) target_link_libraries(${NAME}_test - ${PLATFORM_LINKLIBS} ${EXTRA_LIBS} bf_testing_main bf_intern_guardedalloc diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index c031df82727..30c761b59be 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -297,7 +297,6 @@ macro(setup_liblinks set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}") target_link_libraries(${target} - ${BLENDER_GL_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${FREETYPE_LIBRARY}) @@ -370,14 +369,6 @@ macro(setup_liblinks target_link_libraries(${target} ${OPENJPEG_LIBRARIES}) endif() if(WITH_CODEC_FFMPEG) - - # Strange! Without this ffmpeg gives linking errors (on linux), - # even though it's linked above. - # XXX: Does FFMPEG depend on GLU? - if(WITH_GLU) - target_link_libraries(${target} ${OPENGL_glu_LIBRARY}) - endif() - target_link_libraries(${target} ${FFMPEG_LIBRARIES}) endif() if(WITH_OPENCOLLADA) @@ -425,13 +416,17 @@ macro(setup_liblinks target_link_libraries(${target} ${PTHREADS_LIBRARIES}) endif() - target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS}) - # We put CLEW and CUEW here because OPENSUBDIV_LIBRARIES dpeends on them.. if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV) target_link_libraries(${target} "extern_clew") target_link_libraries(${target} "extern_cuew") endif() + + #system libraries with no dependencies such as platform link libs or opengl should go last + target_link_libraries(${target} + ${BLENDER_GL_LIBRARIES}) + + target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS}) endmacro() macro(SETUP_BLENDER_SORTED_LIBS) |