From 0a90b8bbcffe0326300408802f793d131cdeb8f1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 15 Apr 2019 06:38:26 +0200 Subject: CMake: resolve issue building without sorted libs Linking empty libs gave an error. --- source/creator/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source/creator') 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 -- cgit v1.2.3