168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build qskinny as shared library

This commit is contained in:
Rick Vogel 2022-10-17 21:45:15 +02:00
parent e19620ffaa
commit c33cf9886d
7 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -19,7 +19,7 @@ set(Qt5WebEngine_FIND_COMPONENTS Private CACHE STRING "force include private
set(Qt5WebEngineCore_FIND_COMPONENTS Private CACHE STRING "force include private headers" FORCE) set(Qt5WebEngineCore_FIND_COMPONENTS Private CACHE STRING "force include private headers" FORCE)
set(Qt5Widgets_FIND_COMPONENTS Private CACHE STRING "force include private headers" FORCE) set(Qt5Widgets_FIND_COMPONENTS Private CACHE STRING "force include private headers" FORCE)
set(Qt5_DIR "C:/.conan/ea20b9/1/lib/cmake/Qt5" CACHE PATH "") # TODO pass in externally set(Qt5_DIR "C:/Qt/5.15.2/msvc2019_64/lib/cmake/Qt5" CACHE PATH "") # TODO pass in externally
find_package(Qt5 REQUIRED COMPONENTS Core Gui Opengl Quick Quickwidgets Svg Webengine WebengineCore Widgets) find_package(Qt5 REQUIRED COMPONENTS Core Gui Opengl Quick Quickwidgets Svg Webengine WebengineCore Widgets)
# define install directories # define install directories

6
skins/material3/CMakeLists.txt
View File

@ -14,7 +14,11 @@ list(APPEND TARGET_SOURCES
list(APPEND TARGET_OTHER_FILES list(APPEND TARGET_OTHER_FILES
metadata.json) metadata.json)
add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES}) if(BUILD_QSKDLL)
add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
else()
add_library(${TARGET_NAME} STATIC ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
endif()
target_link_libraries(${TARGET_NAME} PRIVATE qskinny) target_link_libraries(${TARGET_NAME} PRIVATE qskinny)

3
skins/material3/QskMaterial3SkinFactory.h
View File

@ -12,9 +12,10 @@
class QSK_MATERIAL3_EXPORT QskMaterial3SkinFactory : public QskSkinFactory class QSK_MATERIAL3_EXPORT QskMaterial3SkinFactory : public QskSkinFactory
{ {
Q_OBJECT Q_OBJECT
#if defined( QSK_MATERIAL3_MAKEDLL )
Q_PLUGIN_METADATA( IID QskSkinFactoryIID FILE "metadata.json" ) Q_PLUGIN_METADATA( IID QskSkinFactoryIID FILE "metadata.json" )
Q_INTERFACES( QskSkinFactory ) Q_INTERFACES( QskSkinFactory )
#endif
public: public:
QskMaterial3SkinFactory( QObject* parent = nullptr ); QskMaterial3SkinFactory( QObject* parent = nullptr );

6
skins/squiek/CMakeLists.txt
View File

@ -14,7 +14,11 @@ list(APPEND TARGET_SOURCES
list(APPEND TARGET_OTHER_FILES list(APPEND TARGET_OTHER_FILES
metadata.json) metadata.json)
add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES}) if(BUILD_QSKDLL)
add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
else()
add_library(${TARGET_NAME} STATIC ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
endif()
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE

2
skins/squiek/QskSquiekSkinFactory.h
View File

@ -13,8 +13,10 @@ class QSK_SQUIEK_EXPORT QskSquiekSkinFactory : public QskSkinFactory
{ {
Q_OBJECT Q_OBJECT
#if defined( QSK_SQUIEK_MAKEDLL )
Q_PLUGIN_METADATA( IID QskSkinFactoryIID FILE "metadata.json" ) Q_PLUGIN_METADATA( IID QskSkinFactoryIID FILE "metadata.json" )
Q_INTERFACES( QskSkinFactory ) Q_INTERFACES( QskSkinFactory )
#endif
public: public:
QskSquiekSkinFactory( QObject* parent = nullptr ); QskSquiekSkinFactory( QObject* parent = nullptr );

6
src/CMakeLists.txt
View File

@ -408,7 +408,11 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME qskinny) set(TARGET_NAME qskinny)
add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES}) if(BUILD_QSKDLL)
add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
else()
add_library(${TARGET_NAME} STATIC ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
endif()
if (Qt5_VERSION_MAJOR VERSION_GREATER "5") if (Qt5_VERSION_MAJOR VERSION_GREATER "5")
target_link_libraries(${TARGET_NAME} PRIVATE Qt5::Opengl) target_link_libraries(${TARGET_NAME} PRIVATE Qt5::Opengl)

8
support/CMakeLists.txt
View File

@ -36,13 +36,17 @@ list(APPEND TARGET_SOURCES
set(TARGET_NAME qsktestsupport) set(TARGET_NAME qsktestsupport)
add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS}) if (BUILD_QSKDLL)
add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS})
else()
add_library(${TARGET_NAME} STATIC ${TARGET_SOURCES} ${TARGET_HEADERS})
endif()
set_target_properties(${TARGET_NAME} PROPERTIES set_target_properties(${TARGET_NAME} PROPERTIES
AUTOMOC ON) AUTOMOC ON)
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PUBLIC
qskinny) qskinny)
if (BUILD_QSKDLL) if (BUILD_QSKDLL)