From f1c4976fe08fdb20cf18ee04f9a24cdf6aafa261 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sun, 6 May 2018 19:34:58 -0400 Subject: [PATCH] Oh right, I forgot to remove the static library fuckery from the darwin CMakeLists.txt. NOW MERGING. --- darwin/CMakeLists.txt | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/darwin/CMakeLists.txt b/darwin/CMakeLists.txt index d03d0f0d..6bf91a85 100644 --- a/darwin/CMakeLists.txt +++ b/darwin/CMakeLists.txt @@ -58,31 +58,8 @@ list(APPEND _LIBUI_INCLUDEDIRS set(_LIBUI_INCLUDEDIRS _LIBUI_INCLUDEDIRS PARENT_SCOPE) set(_LIBUINAME libui PARENT_SCOPE) -if(NOT BUILD_SHARED_LIBS) - set(_LIBUINAME libui-temporary PARENT_SCOPE) -endif() -# thanks to Mr-Hide in irc.freenode.net/#cmake -# TODO remove all these temporary files after linking the final archive file macro(_handle_static) - set_target_properties(${_LIBUINAME} PROPERTIES - ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}") - set(_aname $) - set(_lname libui-combined.list) - set(_oname libui-combined.o) - add_custom_command( - OUTPUT ${_oname} - COMMAND - nm -m ${_aname} | sed -E -n "'s/^[0-9a-f]* \\([A-Z_]+,[a-z_]+\\) external //p'" > ${_lname} - COMMAND - ld -exported_symbols_list ${_lname} -r -all_load ${_aname} -o ${_oname} - COMMENT "Removing hidden symbols") - add_library(libui STATIC ${_oname}) - # otherwise cmake won't know which linker to use - set_target_properties(libui PROPERTIES - LINKER_LANGUAGE C) - set(_aname) - set(_lname) - set(_oname) + # do nothing endmacro() set(_LIBUI_LIBS