CMake: resolve issue building without sorted libs

Linking empty libs gave an error.
This commit is contained in:
Campbell Barton
2019-04-15 06:38:26 +02:00
parent 860a9f979d
commit 0a90b8bbcf
2 changed files with 11 additions and 2 deletions

View File

@@ -236,7 +236,9 @@ function(blender_add_lib__impl
# Use for testing 'BLENDER_SORTED_LIBS' removal. # Use for testing 'BLENDER_SORTED_LIBS' removal.
if(DEFINED WITHOUT_SORTED_LIBS AND WITHOUT_SORTED_LIBS) if(DEFINED WITHOUT_SORTED_LIBS AND WITHOUT_SORTED_LIBS)
target_link_libraries(${name} "${libraries}") if (NOT "${libraries}" STREQUAL "")
target_link_libraries(${name} "${libraries}")
endif()
endif() endif()
# works fine without having the includes # works fine without having the includes

View File

@@ -37,6 +37,9 @@ blender_include_dirs(
../blender/windowmanager ../blender/windowmanager
) )
set(LIB
)
add_definitions(${GL_DEFINITIONS}) add_definitions(${GL_DEFINITIONS})
blender_include_dirs("${GLEW_INCLUDE_PATH}") blender_include_dirs("${GLEW_INCLUDE_PATH}")
@@ -1025,12 +1028,16 @@ add_dependencies(blender makesdna)
# Use for testing 'BLENDER_SORTED_LIBS' removal. # Use for testing 'BLENDER_SORTED_LIBS' removal.
if(NOT (DEFINED WITHOUT_SORTED_LIBS AND WITHOUT_SORTED_LIBS)) if(NOT (DEFINED WITHOUT_SORTED_LIBS AND WITHOUT_SORTED_LIBS))
setup_blender_sorted_libs() setup_blender_sorted_libs()
target_link_libraries(blender ${BLENDER_SORTED_LIBS})
else()
target_link_libraries(blender ${LIB})
endif() endif()
target_link_libraries(blender ${BLENDER_SORTED_LIBS})
setup_liblinks(blender) setup_liblinks(blender)
unset(LIB)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Setup launcher # Setup launcher