GH-1876 turn iconfix into a shared library

This commit is contained in:
Petr Mrázek 2017-05-05 09:43:20 +02:00
parent e854894a3c
commit 9d4c188fd4
3 changed files with 10 additions and 5 deletions

View File

@ -21,7 +21,7 @@ set_target_properties(MultiMC_gui PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBI
generate_export_header(MultiMC_gui)
# Link
target_link_libraries(MultiMC_gui iconfix MultiMC_logic)
target_link_libraries(MultiMC_gui MultiMC_iconfix MultiMC_logic)
qt5_use_modules(MultiMC_gui Gui)
# Mark and export headers

View File

@ -12,7 +12,10 @@ internal/qiconloader.cpp
internal/qiconloader_p.h
)
add_library(iconfix STATIC ${ICONFIX_SOURCES})
target_include_directories(iconfix PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
add_library(MultiMC_iconfix SHARED ${ICONFIX_SOURCES})
target_include_directories(MultiMC_iconfix PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}" )
qt5_use_modules(iconfix Core Widgets)
qt5_use_modules(MultiMC_iconfix Core Widgets)
set_target_properties(MultiMC_iconfix PROPERTIES CXX_VISIBILITY_PRESET hidden VISIBILITY_INLINES_HIDDEN 1)
generate_export_header(MultiMC_iconfix)

View File

@ -31,7 +31,9 @@
#include <QString>
#include <QStringList>
class XdgIcon
#include "multimc_iconfix_export.h"
class MULTIMC_ICONFIX_EXPORT XdgIcon
{
public:
static QIcon fromTheme(const QString &iconName, const QIcon &fallback = QIcon());