[Bf-blender-cvs] [0a90b8bbcff] master: CMake: resolve issue building without sorted libs
Campbell Barton
noreply at git.blender.org
Mon Apr 15 06:46:35 CEST 2019
Commit: 0a90b8bbcffe0326300408802f793d131cdeb8f1
Author: Campbell Barton
Date: Mon Apr 15 06:38:26 2019 +0200
Branches: master
https://developer.blender.org/rB0a90b8bbcffe0326300408802f793d131cdeb8f1
CMake: resolve issue building without sorted libs
Linking empty libs gave an error.
===================================================================
M build_files/cmake/macros.cmake
M source/creator/CMakeLists.txt
===================================================================
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index c4ae75db9d7..3947f087105 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -236,7 +236,9 @@ function(blender_add_lib__impl
# Use for testing 'BLENDER_SORTED_LIBS' removal.
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()
# works fine without having the includes
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index e4045d0b77c..1455560d138 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -37,6 +37,9 @@ blender_include_dirs(
../blender/windowmanager
)
+set(LIB
+)
+
add_definitions(${GL_DEFINITIONS})
blender_include_dirs("${GLEW_INCLUDE_PATH}")
@@ -1025,12 +1028,16 @@ add_dependencies(blender makesdna)
# Use for testing 'BLENDER_SORTED_LIBS' removal.
if(NOT (DEFINED WITHOUT_SORTED_LIBS AND WITHOUT_SORTED_LIBS))
setup_blender_sorted_libs()
+ target_link_libraries(blender ${BLENDER_SORTED_LIBS})
+else()
+ target_link_libraries(blender ${LIB})
endif()
-target_link_libraries(blender ${BLENDER_SORTED_LIBS})
setup_liblinks(blender)
+unset(LIB)
+
# -----------------------------------------------------------------------------
# Setup launcher
More information about the Bf-blender-cvs
mailing list