From e19620ffaa5437c277abe46b4be17995ad279ad8 Mon Sep 17 00:00:00 2001 From: Rick Vogel Date: Mon, 10 Oct 2022 14:11:13 +0200 Subject: [PATCH] Unified option naming to ENABLE_ and BUILD_ --- examples/qvgviewer/CMakeLists.txt | 4 ++-- features/qskconfig.cmake | 2 +- inputcontext/CMakeLists.txt | 2 +- qmlexport/CMakeLists.txt | 2 +- skins/material3/CMakeLists.txt | 2 +- skins/squiek/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- support/CMakeLists.txt | 6 +++--- tools/svg2qvg/CMakeLists.txt | 9 ++------- 9 files changed, 13 insertions(+), 18 deletions(-) diff --git a/examples/qvgviewer/CMakeLists.txt b/examples/qvgviewer/CMakeLists.txt index ab3b462e..7b0894f2 100644 --- a/examples/qvgviewer/CMakeLists.txt +++ b/examples/qvgviewer/CMakeLists.txt @@ -39,9 +39,9 @@ target_link_libraries(${TARGET_NAME} qskinny 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 ${CMAKE_CURRENT_LIST_DIR}/qvg/01.01.10.qvg) svg2qvg(${CMAKE_CURRENT_LIST_DIR}/svg/01.03.04q.svg diff --git a/features/qskconfig.cmake b/features/qskconfig.cmake index 17ff525a..951b59c4 100644 --- a/features/qskconfig.cmake +++ b/features/qskconfig.cmake @@ -49,7 +49,7 @@ set(MOC_DIR moc) set(OBJECTS_DIR obj) 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) set(LINUX TRUE) diff --git a/inputcontext/CMakeLists.txt b/inputcontext/CMakeLists.txt index 73da5b68..0d3c6dc0 100644 --- a/inputcontext/CMakeLists.txt +++ b/inputcontext/CMakeLists.txt @@ -15,7 +15,7 @@ list(APPEND 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} PRIVATE QSK_INPUTCONTEXT_MAKEDLL) diff --git a/qmlexport/CMakeLists.txt b/qmlexport/CMakeLists.txt index f9cd0b6a..4bd6b8fa 100644 --- a/qmlexport/CMakeLists.txt +++ b/qmlexport/CMakeLists.txt @@ -27,7 +27,7 @@ target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_LIST_DIR}) -if(QskDll) +if(BUILD_QSKDLL) target_compile_definitions(${TARGET_NAME} PRIVATE QSK_QML_MAKEDLL) diff --git a/skins/material3/CMakeLists.txt b/skins/material3/CMakeLists.txt index ca5b4b47..8b504e4f 100644 --- a/skins/material3/CMakeLists.txt +++ b/skins/material3/CMakeLists.txt @@ -18,7 +18,7 @@ add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_O target_link_libraries(${TARGET_NAME} PRIVATE qskinny) -if(QskDll) +if(BUILD_QSKDLL) target_compile_definitions(${TARGET_NAME} PRIVATE QSK_MATERIAL3_MAKEDLL) diff --git a/skins/squiek/CMakeLists.txt b/skins/squiek/CMakeLists.txt index e531c9de..59525af7 100644 --- a/skins/squiek/CMakeLists.txt +++ b/skins/squiek/CMakeLists.txt @@ -20,7 +20,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE qskinny) -if(QskDll) +if(BUILD_QSKDLL) target_compile_definitions(${TARGET_NAME} PRIVATE QSK_SQUIEK_MAKEDLL) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7d9b159f..e43af76e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -414,7 +414,7 @@ if (Qt5_VERSION_MAJOR VERSION_GREATER "5") target_link_libraries(${TARGET_NAME} PRIVATE Qt5::Opengl) endif() -if(QskDll) +if(BUILD_QSKDLL) target_compile_definitions(${TARGET_NAME} PUBLIC QSK_DLL diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index 80b56b9f..70555a45 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -45,7 +45,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE qskinny) -if (QskDll) +if (BUILD_QSKDLL) target_compile_definitions(${TARGET_NAME} PRIVATE SKINNY_MAKEDLL) @@ -59,9 +59,9 @@ target_include_directories(${TARGET_NAME} PUBLIC ${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_compile_definitions(${TARGET_NAME} PRIVATE ENSURE_SKINS) diff --git a/tools/svg2qvg/CMakeLists.txt b/tools/svg2qvg/CMakeLists.txt index 9058c223..87fc8dfe 100644 --- a/tools/svg2qvg/CMakeLists.txt +++ b/tools/svg2qvg/CMakeLists.txt @@ -2,12 +2,11 @@ set(TARGET_NAME svg2qvg) set(TARGET_INSTALL_SUFFIX bin/tools) set(TARGET_SOURCES main.cpp) -#TODO should this be configurable globally ? -option(${TARGET_NAME}_STANDALONE "If 'ON' application won't be linked against qskinny library" ON) +option(BUILD_SVG2QVG_STANDALONE "If 'ON' application won't be linked against qskinny library" ON) add_executable(${TARGET_NAME} ${TARGET_SOURCES}) -if(${TARGET_NAME}_STANDALONE) +if(BUILD_SVG2QVG_STANDALONE) get_target_property(qskinny_AUTOGEN_DIR qskinny AUTOGEN_BUILD_DIR) if (EXISTS ${qskinny_AUTOGEN_DIR}) @@ -31,10 +30,6 @@ if(${TARGET_NAME}_STANDALONE) Qt5::GuiPrivate Qt5::Svg) else() - target_compile_definitions(${TARGET_NAME} - PRIVATE - QskDll) - target_link_libraries(${TARGET_NAME} PRIVATE qskinny