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

Unified option naming to ENABLE_ and BUILD_

This commit is contained in:
Rick Vogel 2022-10-10 14:11:13 +02:00
parent dfbcf73e76
commit e19620ffaa
9 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/qvgviewer/CMakeLists.txt
View File

@ -39,9 +39,9 @@ target_link_libraries(${TARGET_NAME}
qskinny qskinny
qsktestsupport) qsktestsupport)
option(autoqvg "enable automatic qvg commpilation" OFF) option(ENABLE_AUTOQVG "enable automatic qvg commpilation" OFF)
if(autoqvg) if(ENABLE_AUTOQVG)
svg2qvg(${CMAKE_CURRENT_LIST_DIR}/svg/01.01.10.svg svg2qvg(${CMAKE_CURRENT_LIST_DIR}/svg/01.01.10.svg
${CMAKE_CURRENT_LIST_DIR}/qvg/01.01.10.qvg) ${CMAKE_CURRENT_LIST_DIR}/qvg/01.01.10.qvg)
svg2qvg(${CMAKE_CURRENT_LIST_DIR}/svg/01.03.04q.svg svg2qvg(${CMAKE_CURRENT_LIST_DIR}/svg/01.03.04q.svg

2
features/qskconfig.cmake
View File

@ -49,7 +49,7 @@ set(MOC_DIR moc)
set(OBJECTS_DIR obj) set(OBJECTS_DIR obj)
set(RCC_DIR rcc) set(RCC_DIR rcc)
option(QskDll "build qskinny as shared library" ON) option(BUILD_QSKDLL "build qskinny as shared library" ON)
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
set(LINUX TRUE) set(LINUX TRUE)

2
inputcontext/CMakeLists.txt
View File

@ -15,7 +15,7 @@ list(APPEND TARGET_OTHER_FILES
add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_OTHER_FILES}) add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_OTHER_FILES})
if(QskDll) if(BUILD_QSKDLL)
target_compile_definitions(${TARGET_NAME} target_compile_definitions(${TARGET_NAME}
PRIVATE PRIVATE
QSK_INPUTCONTEXT_MAKEDLL) QSK_INPUTCONTEXT_MAKEDLL)

2
qmlexport/CMakeLists.txt
View File

@ -27,7 +27,7 @@ target_include_directories(${TARGET_NAME}
PUBLIC PUBLIC
${CMAKE_CURRENT_LIST_DIR}) ${CMAKE_CURRENT_LIST_DIR})
if(QskDll) if(BUILD_QSKDLL)
target_compile_definitions(${TARGET_NAME} target_compile_definitions(${TARGET_NAME}
PRIVATE PRIVATE
QSK_QML_MAKEDLL) QSK_QML_MAKEDLL)

2
skins/material3/CMakeLists.txt
View File

@ -18,7 +18,7 @@ add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_O
target_link_libraries(${TARGET_NAME} PRIVATE qskinny) target_link_libraries(${TARGET_NAME} PRIVATE qskinny)
if(QskDll) if(BUILD_QSKDLL)
target_compile_definitions(${TARGET_NAME} target_compile_definitions(${TARGET_NAME}
PRIVATE PRIVATE
QSK_MATERIAL3_MAKEDLL) QSK_MATERIAL3_MAKEDLL)

2
skins/squiek/CMakeLists.txt
View File

@ -20,7 +20,7 @@ target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE
qskinny) qskinny)
if(QskDll) if(BUILD_QSKDLL)
target_compile_definitions(${TARGET_NAME} target_compile_definitions(${TARGET_NAME}
PRIVATE PRIVATE
QSK_SQUIEK_MAKEDLL) QSK_SQUIEK_MAKEDLL)

2
src/CMakeLists.txt
View File

@ -414,7 +414,7 @@ if (Qt5_VERSION_MAJOR VERSION_GREATER "5")
target_link_libraries(${TARGET_NAME} PRIVATE Qt5::Opengl) target_link_libraries(${TARGET_NAME} PRIVATE Qt5::Opengl)
endif() endif()
if(QskDll) if(BUILD_QSKDLL)
target_compile_definitions(${TARGET_NAME} target_compile_definitions(${TARGET_NAME}
PUBLIC PUBLIC
QSK_DLL QSK_DLL

6
support/CMakeLists.txt
View File

@ -45,7 +45,7 @@ target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE
qskinny) qskinny)
if (QskDll) if (BUILD_QSKDLL)
target_compile_definitions(${TARGET_NAME} target_compile_definitions(${TARGET_NAME}
PRIVATE PRIVATE
SKINNY_MAKEDLL) SKINNY_MAKEDLL)
@ -59,9 +59,9 @@ target_include_directories(${TARGET_NAME}
PUBLIC PUBLIC
${CMAKE_CURRENT_LIST_DIR}) ${CMAKE_CURRENT_LIST_DIR})
option(ensure_skins "Enabling fall back code, that inserts some skin factories manually when not finding skin factories as plugins" ON) option(ENABLE_ENSURE_SKINS "Enabling fall back code, that inserts some skin factories manually when not finding skin factories as plugins" ON)
if(ensure_skins) if(ENABLE_ENSURE_SKINS)
target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/skins) target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/skins)
target_compile_definitions(${TARGET_NAME} PRIVATE ENSURE_SKINS) target_compile_definitions(${TARGET_NAME} PRIVATE ENSURE_SKINS)

9
tools/svg2qvg/CMakeLists.txt
View File

@ -2,12 +2,11 @@ set(TARGET_NAME svg2qvg)
set(TARGET_INSTALL_SUFFIX bin/tools) set(TARGET_INSTALL_SUFFIX bin/tools)
set(TARGET_SOURCES main.cpp) set(TARGET_SOURCES main.cpp)
#TODO should this be configurable globally ? option(BUILD_SVG2QVG_STANDALONE "If 'ON' application won't be linked against qskinny library" ON)
option(${TARGET_NAME}_STANDALONE "If 'ON' application won't be linked against qskinny library" ON)
add_executable(${TARGET_NAME} ${TARGET_SOURCES}) add_executable(${TARGET_NAME} ${TARGET_SOURCES})
if(${TARGET_NAME}_STANDALONE) if(BUILD_SVG2QVG_STANDALONE)
get_target_property(qskinny_AUTOGEN_DIR qskinny AUTOGEN_BUILD_DIR) get_target_property(qskinny_AUTOGEN_DIR qskinny AUTOGEN_BUILD_DIR)
if (EXISTS ${qskinny_AUTOGEN_DIR}) if (EXISTS ${qskinny_AUTOGEN_DIR})
@ -31,10 +30,6 @@ if(${TARGET_NAME}_STANDALONE)
Qt5::GuiPrivate Qt5::GuiPrivate
Qt5::Svg) Qt5::Svg)
else() else()
target_compile_definitions(${TARGET_NAME}
PRIVATE
QskDll)
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE
qskinny qskinny