centralizing cmake settings
This commit is contained in:
Uwe Rathmann
parent
11b200517b
commit
6ae153b28b
|
|
@ -1,488 +0,0 @@
|
||||||
name: CI
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [ master ]
|
|
||||||
pull_request:
|
|
||||||
branches: [ master ]
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
|
|
||||||
build-linux-qt5-15:
|
|
||||||
name: Linux Qt 5.15 build
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
env:
|
|
||||||
DISPLAY: ":1"
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
- name: Cache Qt
|
|
||||||
id: cache-qt-5-15
|
|
||||||
uses: actions/cache@v1 # not v2!
|
|
||||||
with:
|
|
||||||
path: ../Qt/5.15.2
|
|
||||||
key: ${{ runner.os }}-QtCache-Qt5
|
|
||||||
|
|
||||||
- name: Install Qt
|
|
||||||
uses: jurplel/install-qt-action@v2
|
|
||||||
with:
|
|
||||||
version: '5.15.2'
|
|
||||||
host: 'linux'
|
|
||||||
target: 'desktop'
|
|
||||||
install-deps: 'true'
|
|
||||||
modules: 'qtwebengine'
|
|
||||||
cached: ${{ steps.cache-qt-5-15.outputs.cache-hit }}
|
|
||||||
setup-python: 'true'
|
|
||||||
tools: ''
|
|
||||||
set-env: 'true'
|
|
||||||
tools-only: 'false'
|
|
||||||
|
|
||||||
- name: Ubuntu and Qt version
|
|
||||||
run: |
|
|
||||||
cat /etc/issue
|
|
||||||
echo number of processors: $(nproc)
|
|
||||||
qmake -v
|
|
||||||
- name: qmake
|
|
||||||
run: qmake qskinny.pro
|
|
||||||
- name: make
|
|
||||||
run: make -j$(nproc)
|
|
||||||
- name: Smoke test
|
|
||||||
run: |
|
|
||||||
echo starting Xvfb
|
|
||||||
Xvfb :1 &
|
|
||||||
sleep 10
|
|
||||||
echo starting iotdashboard
|
|
||||||
./examples/bin/iotdashboard &
|
|
||||||
sleep 10
|
|
||||||
echo taking screenshot
|
|
||||||
import -pause 1 -window root screenshot-linux-qt5-15.jpg
|
|
||||||
echo killing iotdashboard
|
|
||||||
killall iotdashboard
|
|
||||||
echo killing Xvfb
|
|
||||||
killall Xvfb
|
|
||||||
- name: Upload smoke test artifacts
|
|
||||||
uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: screenshot-linux-qt5-15.jpg
|
|
||||||
path: screenshot-linux-qt5-15.jpg
|
|
||||||
|
|
||||||
|
|
||||||
build-linux-qt-lts:
|
|
||||||
name: Linux Qt 6.2 (LTS) build
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
env:
|
|
||||||
DISPLAY: ":1"
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
- name: Cache Qt
|
|
||||||
id: cache-qt-6-2
|
|
||||||
uses: actions/cache@v1 # not v2!
|
|
||||||
with:
|
|
||||||
path: ../Qt/6.2.4
|
|
||||||
key: ${{ runner.os }}-QtCache-Qt6-2
|
|
||||||
|
|
||||||
- name: Install Qt
|
|
||||||
uses: jurplel/install-qt-action@v2
|
|
||||||
with:
|
|
||||||
version: '6.2.4'
|
|
||||||
host: 'linux'
|
|
||||||
target: 'desktop'
|
|
||||||
install-deps: 'true'
|
|
||||||
modules: 'qtwebengine'
|
|
||||||
cached: ${{ steps.cache-qt-6-2.outputs.cache-hit }}
|
|
||||||
setup-python: 'true'
|
|
||||||
tools: ''
|
|
||||||
set-env: 'true'
|
|
||||||
tools-only: 'false'
|
|
||||||
|
|
||||||
- name: Install needed xkbcommon symlink
|
|
||||||
run: sudo apt-get install libxkbcommon-dev -y
|
|
||||||
- name: Ubuntu and Qt version
|
|
||||||
run: |
|
|
||||||
cat /etc/issue
|
|
||||||
echo number of processors: $(nproc)
|
|
||||||
qmake -v
|
|
||||||
- name: qmake
|
|
||||||
run: qmake qskinny.pro
|
|
||||||
- name: make
|
|
||||||
run: make -j$(nproc)
|
|
||||||
- name: Smoke test
|
|
||||||
run: |
|
|
||||||
echo starting Xvfb
|
|
||||||
Xvfb :1 &
|
|
||||||
sleep 10
|
|
||||||
echo starting gallery
|
|
||||||
./examples/bin/gallery &
|
|
||||||
sleep 10
|
|
||||||
echo taking screenshot
|
|
||||||
import -pause 1 -window root screenshot-linux-qt6-2.jpg
|
|
||||||
echo killing gallery
|
|
||||||
killall gallery
|
|
||||||
echo killing Xvfb
|
|
||||||
killall Xvfb
|
|
||||||
- name: Upload smoke test artifacts
|
|
||||||
uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: screenshot-linux-qt6-2.jpg
|
|
||||||
path: screenshot-linux-qt6-2.jpg
|
|
||||||
|
|
||||||
|
|
||||||
build-linux-qt-current:
|
|
||||||
name: Linux Qt 6.4 (current) build
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
env:
|
|
||||||
DISPLAY: ":1"
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
- name: Cache Qt
|
|
||||||
id: cache-qt-6-4
|
|
||||||
uses: actions/cache@v1 # not v2!
|
|
||||||
with:
|
|
||||||
path: ../Qt/6.4.1
|
|
||||||
key: ${{ runner.os }}-QtCache-Qt6-4
|
|
||||||
|
|
||||||
- name: Install Qt
|
|
||||||
uses: jurplel/install-qt-action@v2
|
|
||||||
with:
|
|
||||||
version: '6.4.1'
|
|
||||||
host: 'linux'
|
|
||||||
target: 'desktop'
|
|
||||||
install-deps: 'true'
|
|
||||||
modules: 'qtwebengine'
|
|
||||||
cached: ${{ steps.cache-qt-6-4.outputs.cache-hit }}
|
|
||||||
setup-python: 'true'
|
|
||||||
tools: ''
|
|
||||||
set-env: 'true'
|
|
||||||
tools-only: 'false'
|
|
||||||
|
|
||||||
- name: Install needed xkbcommon symlink
|
|
||||||
run: sudo apt-get install libxkbcommon-dev -y
|
|
||||||
- name: Ubuntu and Qt version
|
|
||||||
run: |
|
|
||||||
cat /etc/issue
|
|
||||||
echo number of processors: $(nproc)
|
|
||||||
qmake -v
|
|
||||||
- name: qmake
|
|
||||||
run: qmake qskinny.pro
|
|
||||||
- name: make
|
|
||||||
run: make -j$(nproc)
|
|
||||||
- name: Smoke test
|
|
||||||
run: |
|
|
||||||
echo starting Xvfb
|
|
||||||
Xvfb :1 &
|
|
||||||
sleep 10
|
|
||||||
echo starting gallery
|
|
||||||
./examples/bin/gallery &
|
|
||||||
sleep 10
|
|
||||||
echo taking screenshot
|
|
||||||
import -pause 1 -window root screenshot-linux-qt6-4.jpg
|
|
||||||
echo killing gallery
|
|
||||||
killall gallery
|
|
||||||
echo killing Xvfb
|
|
||||||
killall Xvfb
|
|
||||||
- name: Upload smoke test artifacts
|
|
||||||
uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: screenshot-linux-qt6-4.jpg
|
|
||||||
path: screenshot-linux-qt6-4.jpg
|
|
||||||
|
|
||||||
|
|
||||||
build-windows-qt5-15:
|
|
||||||
name: Windows Qt 5.15 build
|
|
||||||
runs-on: windows-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
- name: Cache Qt
|
|
||||||
id: cache-qt-5-15
|
|
||||||
uses: actions/cache@v1 # not v2!
|
|
||||||
with:
|
|
||||||
path: ../Qt/5.15.2
|
|
||||||
key: ${{ runner.os }}-QtCache-Qt5
|
|
||||||
|
|
||||||
- name: Install Qt
|
|
||||||
uses: jurplel/install-qt-action@v2
|
|
||||||
with:
|
|
||||||
version: '5.15.2'
|
|
||||||
host: 'windows'
|
|
||||||
target: 'desktop'
|
|
||||||
arch: 'win64_msvc2019_64'
|
|
||||||
install-deps: 'true'
|
|
||||||
modules: 'qtwebengine'
|
|
||||||
cached: ${{ steps.cache-qt-5-15.outputs.cache-hit }}
|
|
||||||
setup-python: 'true'
|
|
||||||
tools: ''
|
|
||||||
set-env: 'true'
|
|
||||||
tools-only: 'false'
|
|
||||||
|
|
||||||
- uses: ilammy/msvc-dev-cmd@v1
|
|
||||||
|
|
||||||
- name: Windows and Qt version
|
|
||||||
run: |
|
|
||||||
systeminfo /fo csv | ConvertFrom-Csv | select OS*, System*, Hotfix* | Format-List
|
|
||||||
qmake -v
|
|
||||||
|
|
||||||
- name: qmake
|
|
||||||
run: qmake qskinny.pro
|
|
||||||
|
|
||||||
- name: jom
|
|
||||||
run: |
|
|
||||||
Invoke-WebRequest -Uri "https://download.qt.io/official_releases/jom/jom.zip" -OutFile jom.zip
|
|
||||||
unzip jom.zip
|
|
||||||
.\jom
|
|
||||||
- name: Smoke test
|
|
||||||
run: |
|
|
||||||
$Env:PATH += ";lib;plugins\skins"
|
|
||||||
echo "starting iotdashboard"
|
|
||||||
Start-Process .\examples\bin\iotdashboard -ArgumentList "-qwindowgeometry 1024x600+0+0"
|
|
||||||
Start-Sleep -s 10
|
|
||||||
- uses: OrbitalOwen/desktop-screenshot-action@0.1
|
|
||||||
with:
|
|
||||||
file-name: 'screenshot-windows-qt5-15.jpg'
|
|
||||||
- name: Cleanup smoke test
|
|
||||||
run: taskkill /IM iotdashboard.exe /T
|
|
||||||
|
|
||||||
|
|
||||||
build-windows-qt-lts:
|
|
||||||
name: Windows Qt 6.2 (LTS) build
|
|
||||||
runs-on: windows-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
- name: Cache Qt
|
|
||||||
id: cache-qt-6-2
|
|
||||||
uses: actions/cache@v1 # not v2!
|
|
||||||
with:
|
|
||||||
path: ../Qt/6.2.4
|
|
||||||
key: ${{ runner.os }}-QtCache-Qt6-2
|
|
||||||
|
|
||||||
- name: Install Qt
|
|
||||||
uses: jurplel/install-qt-action@v2
|
|
||||||
with:
|
|
||||||
version: '6.2.4'
|
|
||||||
host: 'windows'
|
|
||||||
target: 'desktop'
|
|
||||||
arch: 'win64_msvc2019_64'
|
|
||||||
install-deps: 'true'
|
|
||||||
modules: 'qtwebengine'
|
|
||||||
cached: ${{ steps.cache-qt-6-2.outputs.cache-hit }}
|
|
||||||
setup-python: 'true'
|
|
||||||
tools: ''
|
|
||||||
set-env: 'true'
|
|
||||||
tools-only: 'false'
|
|
||||||
|
|
||||||
- uses: ilammy/msvc-dev-cmd@v1
|
|
||||||
|
|
||||||
- name: Windows and Qt version
|
|
||||||
run: |
|
|
||||||
systeminfo /fo csv | ConvertFrom-Csv | select OS*, System*, Hotfix* | Format-List
|
|
||||||
qmake -v
|
|
||||||
|
|
||||||
- name: qmake
|
|
||||||
run: qmake qskinny.pro
|
|
||||||
|
|
||||||
- name: jom
|
|
||||||
run: |
|
|
||||||
Invoke-WebRequest -Uri "https://download.qt.io/official_releases/jom/jom.zip" -OutFile jom.zip
|
|
||||||
unzip jom.zip
|
|
||||||
.\jom
|
|
||||||
- name: Smoke test
|
|
||||||
run: |
|
|
||||||
$Env:PATH += ";lib;plugins\skins"
|
|
||||||
echo "starting gallery"
|
|
||||||
Start-Process .\examples\bin\gallery -ArgumentList "-qwindowgeometry 1024x600+0+0"
|
|
||||||
Start-Sleep -s 10
|
|
||||||
- uses: OrbitalOwen/desktop-screenshot-action@0.1
|
|
||||||
with:
|
|
||||||
file-name: 'screenshot-windows-qt6-2.jpg'
|
|
||||||
- name: Cleanup smoke test
|
|
||||||
run: taskkill /IM gallery.exe /T
|
|
||||||
|
|
||||||
|
|
||||||
build-windows-qt-current:
|
|
||||||
name: Windows Qt 6.4 (current) build
|
|
||||||
runs-on: windows-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
- name: Cache Qt
|
|
||||||
id: cache-qt-6-4
|
|
||||||
uses: actions/cache@v1 # not v2!
|
|
||||||
with:
|
|
||||||
path: ../Qt/6.4.1
|
|
||||||
key: ${{ runner.os }}-QtCache-Qt6-4
|
|
||||||
|
|
||||||
- name: Install Qt
|
|
||||||
uses: jurplel/install-qt-action@v2
|
|
||||||
with:
|
|
||||||
version: '6.4.1'
|
|
||||||
host: 'windows'
|
|
||||||
target: 'desktop'
|
|
||||||
arch: 'win64_msvc2019_64'
|
|
||||||
install-deps: 'true'
|
|
||||||
modules: 'qtwebengine'
|
|
||||||
cached: ${{ steps.cache-qt-6-4.outputs.cache-hit }}
|
|
||||||
setup-python: 'true'
|
|
||||||
tools: ''
|
|
||||||
set-env: 'true'
|
|
||||||
tools-only: 'false'
|
|
||||||
|
|
||||||
- uses: ilammy/msvc-dev-cmd@v1
|
|
||||||
|
|
||||||
- name: Windows and Qt version
|
|
||||||
run: |
|
|
||||||
systeminfo /fo csv | ConvertFrom-Csv | select OS*, System*, Hotfix* | Format-List
|
|
||||||
qmake -v
|
|
||||||
|
|
||||||
- name: qmake
|
|
||||||
run: qmake qskinny.pro
|
|
||||||
|
|
||||||
- name: jom
|
|
||||||
run: |
|
|
||||||
Invoke-WebRequest -Uri "https://download.qt.io/official_releases/jom/jom.zip" -OutFile jom.zip
|
|
||||||
unzip jom.zip
|
|
||||||
.\jom
|
|
||||||
- name: Smoke test
|
|
||||||
run: |
|
|
||||||
$Env:PATH += ";lib;plugins\skins"
|
|
||||||
echo "starting gallery"
|
|
||||||
Start-Process .\examples\bin\gallery -ArgumentList "-qwindowgeometry 1024x600+0+0"
|
|
||||||
Start-Sleep -s 10
|
|
||||||
- uses: OrbitalOwen/desktop-screenshot-action@0.1
|
|
||||||
with:
|
|
||||||
file-name: 'screenshot-windows-qt6-4.jpg'
|
|
||||||
- name: Cleanup smoke test
|
|
||||||
run: taskkill /IM gallery.exe /T
|
|
||||||
|
|
||||||
|
|
||||||
build-mac-qt5-15:
|
|
||||||
name: MacOS Qt 5.15 build
|
|
||||||
runs-on: macos-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
- name: Cache Qt
|
|
||||||
id: cache-qt-5-15
|
|
||||||
uses: actions/cache@v1 # not v2!
|
|
||||||
with:
|
|
||||||
path: ../Qt/5.15.2
|
|
||||||
key: ${{ runner.os }}-QtCache-Qt5
|
|
||||||
|
|
||||||
- name: Install Qt
|
|
||||||
uses: jurplel/install-qt-action@v2
|
|
||||||
with:
|
|
||||||
version: '5.15.2'
|
|
||||||
host: 'mac'
|
|
||||||
target: 'desktop'
|
|
||||||
install-deps: 'true'
|
|
||||||
modules: 'qtwebengine'
|
|
||||||
cached: ${{ steps.cache-qt-5-15.outputs.cache-hit }}
|
|
||||||
setup-python: 'true'
|
|
||||||
tools: ''
|
|
||||||
set-env: 'true'
|
|
||||||
tools-only: 'false'
|
|
||||||
|
|
||||||
- name: MacOS and Qt version
|
|
||||||
run: |
|
|
||||||
sw_vers
|
|
||||||
echo number of processors: $(sysctl -n hw.ncpu)
|
|
||||||
qmake -v
|
|
||||||
- name: qmake
|
|
||||||
run: qmake qskinny.pro
|
|
||||||
- name: make
|
|
||||||
run: make -j$(sysctl -n hw.ncpu)
|
|
||||||
- name: Smoke test
|
|
||||||
run: |
|
|
||||||
DYLD_LIBRARY_PATH=./lib ./examples/bin/iotdashboard.app/Contents/MacOS/iotdashboard -qwindowgeometry 1024x600+75+100 &
|
|
||||||
sleep 10
|
|
||||||
- uses: OrbitalOwen/desktop-screenshot-action@0.1
|
|
||||||
with:
|
|
||||||
file-name: 'screenshot-macos-qt5-15.jpg'
|
|
||||||
- name: Cleanup smoke test
|
|
||||||
run: killall iotdashboard
|
|
||||||
|
|
||||||
|
|
||||||
build-mac-qt-lts:
|
|
||||||
name: MacOS Qt 6.2 (LTS) build
|
|
||||||
runs-on: macos-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
- name: Cache Qt
|
|
||||||
id: cache-qt-6-2
|
|
||||||
uses: actions/cache@v1 # not v2!
|
|
||||||
with:
|
|
||||||
path: ../Qt/6.2.4
|
|
||||||
key: ${{ runner.os }}-QtCache-Qt6-2
|
|
||||||
|
|
||||||
- name: Install Qt
|
|
||||||
uses: jurplel/install-qt-action@v2
|
|
||||||
with:
|
|
||||||
version: '6.2.4'
|
|
||||||
host: 'mac'
|
|
||||||
target: 'desktop'
|
|
||||||
install-deps: 'true'
|
|
||||||
modules: 'qtwebengine'
|
|
||||||
cached: ${{ steps.cache-qt-6-2.outputs.cache-hit }}
|
|
||||||
setup-python: 'true'
|
|
||||||
tools: ''
|
|
||||||
set-env: 'true'
|
|
||||||
tools-only: 'false'
|
|
||||||
|
|
||||||
- name: MacOS and Qt version
|
|
||||||
run: |
|
|
||||||
sw_vers
|
|
||||||
echo number of processors: $(sysctl -n hw.ncpu)
|
|
||||||
qmake -v
|
|
||||||
- name: qmake
|
|
||||||
run: qmake qskinny.pro
|
|
||||||
- name: make
|
|
||||||
run: make -j$(sysctl -n hw.ncpu)
|
|
||||||
- name: Smoke test
|
|
||||||
run: |
|
|
||||||
DYLD_LIBRARY_PATH=./lib ./examples/bin/gallery.app/Contents/MacOS/gallery -qwindowgeometry 1024x600+75+100 &
|
|
||||||
sleep 10
|
|
||||||
- uses: OrbitalOwen/desktop-screenshot-action@0.1
|
|
||||||
with:
|
|
||||||
file-name: 'screenshot-macos-qt6-2.jpg'
|
|
||||||
- name: Cleanup smoke test
|
|
||||||
run: killall gallery
|
|
||||||
|
|
||||||
build-mac-qt-current:
|
|
||||||
name: MacOS Qt 6.4 (current) build
|
|
||||||
runs-on: macos-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v2
|
|
||||||
- name: Cache Qt
|
|
||||||
id: cache-qt-6-4
|
|
||||||
uses: actions/cache@v1 # not v2!
|
|
||||||
with:
|
|
||||||
path: ../Qt/6.4.1
|
|
||||||
key: ${{ runner.os }}-QtCache-Qt6-4
|
|
||||||
|
|
||||||
- name: Install Qt
|
|
||||||
uses: jurplel/install-qt-action@v2
|
|
||||||
with:
|
|
||||||
version: '6.4.1'
|
|
||||||
host: 'mac'
|
|
||||||
target: 'desktop'
|
|
||||||
install-deps: 'true'
|
|
||||||
modules: 'qtwebengine'
|
|
||||||
cached: ${{ steps.cache-qt-6-4.outputs.cache-hit }}
|
|
||||||
setup-python: 'true'
|
|
||||||
tools: ''
|
|
||||||
set-env: 'true'
|
|
||||||
tools-only: 'false'
|
|
||||||
|
|
||||||
- name: MacOS and Qt version
|
|
||||||
run: |
|
|
||||||
sw_vers
|
|
||||||
echo number of processors: $(sysctl -n hw.ncpu)
|
|
||||||
qmake -v
|
|
||||||
- name: qmake
|
|
||||||
run: qmake qskinny.pro
|
|
||||||
- name: make
|
|
||||||
run: make -j$(sysctl -n hw.ncpu)
|
|
||||||
- name: Smoke test
|
|
||||||
run: |
|
|
||||||
DYLD_LIBRARY_PATH=./lib ./examples/bin/gallery.app/Contents/MacOS/gallery -qwindowgeometry 1024x600+75+100 &
|
|
||||||
sleep 10
|
|
||||||
- uses: OrbitalOwen/desktop-screenshot-action@0.1
|
|
||||||
with:
|
|
||||||
file-name: 'screenshot-macos-qt6-4.jpg'
|
|
||||||
- name: Cleanup smoke test
|
|
||||||
run: killall gallery
|
|
||||||
|
|
@ -5,13 +5,20 @@
|
||||||
|
|
||||||
set(QSK_VERSION ${CMAKE_PROJECT_VERSION})
|
set(QSK_VERSION ${CMAKE_PROJECT_VERSION})
|
||||||
|
|
||||||
|
set(CMAKE_AUTOMOC ON)
|
||||||
|
set(CMAKE_AUTORCC ON)
|
||||||
|
set(CMAKE_AUTOUIC OFF)
|
||||||
|
set(CMAKE_GLOBAL_AUTOGEN_TARGET OFF)
|
||||||
|
|
||||||
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
set(AUTOGEN_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/autogen")
|
||||||
|
|
||||||
# TODO find compiler flag equivalent
|
# TODO find compiler flag equivalent
|
||||||
list(APPEND CONFIG no_private_qt_headers_warning)
|
list(APPEND CONFIG no_private_qt_headers_warning)
|
||||||
list(APPEND CONFIG warn_on)
|
list(APPEND CONFIG warn_on)
|
||||||
list(APPEND CONFIG no_keywords)
|
list(APPEND CONFIG no_keywords)
|
||||||
#list(APPEND CONFIG -= depend_includepath) # TODO was -=
|
#list(APPEND CONFIG -= depend_includepath) # TODO was -=
|
||||||
list(APPEND CONFIG strict_c++)
|
|
||||||
list(APPEND CONFIG c++17)
|
|
||||||
list(APPEND CONFIG pedantic)
|
list(APPEND CONFIG pedantic)
|
||||||
list(APPEND CONFIG hide_symbols)
|
list(APPEND CONFIG hide_symbols)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
set_target_properties(${TARGET_NAME} PROPERTIES
|
||||||
|
FOLDER examples
|
||||||
|
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/examples/bin
|
||||||
|
)
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
set_target_properties(${TARGET_NAME} PROPERTIES
|
||||||
|
FOLDER playground
|
||||||
|
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/playground/bin
|
||||||
|
)
|
||||||
|
|
@ -9,12 +9,9 @@ set(TARGET_NAME boxes)
|
||||||
|
|
||||||
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
|
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER examples)
|
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME}
|
target_link_libraries(${TARGET_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
qskinny
|
qskinny
|
||||||
qsktestsupport)
|
qsktestsupport)
|
||||||
|
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/QskExamples.cmake)
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,4 @@ target_link_libraries(${TARGET_NAME}
|
||||||
qsktestsupport
|
qsktestsupport
|
||||||
qskqmlexport)
|
qskqmlexport)
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
include(${CMAKE_SOURCE_DIR}/cmake/QskExamples.cmake)
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
AUTORCC ON
|
|
||||||
FOLDER examples)
|
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,9 @@ set(TARGET_NAME desktop)
|
||||||
|
|
||||||
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES})
|
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES})
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER examples)
|
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME}
|
target_link_libraries(${TARGET_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
qskinny
|
qskinny
|
||||||
qsktestsupport)
|
qsktestsupport)
|
||||||
|
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/QskExamples.cmake)
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,4 @@ target_link_libraries(${TARGET_NAME}
|
||||||
qsktestsupport
|
qsktestsupport
|
||||||
qskqmlexport)
|
qskqmlexport)
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
include(${CMAKE_SOURCE_DIR}/cmake/QskExamples.cmake)
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
AUTORCC ON
|
|
||||||
FOLDER examples)
|
|
||||||
|
|
|
||||||
|
|
@ -17,14 +17,12 @@ list(APPEND TARGET_SOURCES
|
||||||
Page.cpp
|
Page.cpp
|
||||||
main.cpp)
|
main.cpp)
|
||||||
|
|
||||||
|
list(APPEND TARGET_RESSOURCES
|
||||||
|
icons.qrc )
|
||||||
|
|
||||||
set(TARGET_NAME gallery)
|
set(TARGET_NAME gallery)
|
||||||
|
|
||||||
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
|
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES} )
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER examples)
|
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME}
|
target_link_libraries(${TARGET_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
|
|
@ -34,3 +32,5 @@ target_link_libraries(${TARGET_NAME}
|
||||||
target_include_directories(${TARGET_NAME}
|
target_include_directories(${TARGET_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
${CMAKE_CURRENT_LIST_DIR})
|
${CMAKE_CURRENT_LIST_DIR})
|
||||||
|
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/QskExamples.cmake)
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,4 @@ target_link_libraries(${TARGET_NAME}
|
||||||
qsktestsupport
|
qsktestsupport
|
||||||
qskqmlexport)
|
qskqmlexport)
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
include(${CMAKE_SOURCE_DIR}/cmake/QskExamples.cmake)
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
AUTORCC ON
|
|
||||||
FOLDER examples)
|
|
||||||
|
|
|
||||||
|
|
@ -84,12 +84,6 @@ qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
|
||||||
${TARGET_HEADERS}
|
${TARGET_HEADERS}
|
||||||
${TARGET_RESSOURCES})
|
${TARGET_RESSOURCES})
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
AUTORCC ON
|
|
||||||
FOLDER examples)
|
|
||||||
|
|
||||||
if(TARGET Qsk::qskinny)
|
if(TARGET Qsk::qskinny)
|
||||||
# integration test
|
# integration test
|
||||||
# - qsktestsupport doesn't exists
|
# - qsktestsupport doesn't exists
|
||||||
|
|
@ -107,3 +101,5 @@ else()
|
||||||
PRIVATE
|
PRIVATE
|
||||||
USE_SHORTCUTS)
|
USE_SHORTCUTS)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/QskExamples.cmake)
|
||||||
|
|
|
||||||
|
|
@ -24,14 +24,10 @@ set(TARGET_NAME layouts)
|
||||||
|
|
||||||
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
|
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
AUTORCC ON
|
|
||||||
FOLDER examples)
|
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME}
|
target_link_libraries(${TARGET_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
qskinny
|
qskinny
|
||||||
qskqmlexport
|
qskqmlexport
|
||||||
qsktestsupport)
|
qsktestsupport)
|
||||||
|
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/QskExamples.cmake)
|
||||||
|
|
|
||||||
|
|
@ -5,13 +5,9 @@ set(TARGET_NAME listbox)
|
||||||
|
|
||||||
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
|
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESSOURCES})
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
AUTORCC ON
|
|
||||||
FOLDER examples)
|
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME}
|
target_link_libraries(${TARGET_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
qskinny
|
qskinny
|
||||||
qsktestsupport)
|
qsktestsupport)
|
||||||
|
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/QskExamples.cmake)
|
||||||
|
|
|
||||||
|
|
@ -5,13 +5,9 @@ set(TARGET_NAME messagebox)
|
||||||
|
|
||||||
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES})
|
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES})
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
AUTORCC ON
|
|
||||||
FOLDER examples)
|
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME}
|
target_link_libraries(${TARGET_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
qskinny
|
qskinny
|
||||||
qsktestsupport)
|
qsktestsupport)
|
||||||
|
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/QskExamples.cmake)
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,4 @@ target_link_libraries(${TARGET_NAME}
|
||||||
qsktestsupport
|
qsktestsupport
|
||||||
qskqmlexport)
|
qskqmlexport)
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
include(${CMAKE_SOURCE_DIR}/cmake/QskExamples.cmake)
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
AUTORCC ON
|
|
||||||
FOLDER examples)
|
|
||||||
|
|
|
||||||
|
|
@ -13,13 +13,9 @@ set(TARGET_NAME mycontrols)
|
||||||
|
|
||||||
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
|
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
AUTORCC ON
|
|
||||||
FOLDER examples)
|
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME}
|
target_link_libraries(${TARGET_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
qskinny
|
qskinny
|
||||||
qsktestsupport)
|
qsktestsupport)
|
||||||
|
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/QskExamples.cmake)
|
||||||
|
|
|
||||||
|
|
@ -28,12 +28,6 @@ qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE
|
||||||
${TARGET_RESSOURCES}
|
${TARGET_RESSOURCES}
|
||||||
${TARGET_SVGS})
|
${TARGET_SVGS})
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
AUTORCC ON
|
|
||||||
FOLDER examples)
|
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME}
|
target_link_libraries(${TARGET_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
qskinny
|
qskinny
|
||||||
|
|
@ -58,3 +52,5 @@ endif()
|
||||||
target_sources(${TARGET_NAME} PRIVATE ${TARGET_QVGS})
|
target_sources(${TARGET_NAME} PRIVATE ${TARGET_QVGS})
|
||||||
source_group("generated" FILES ${TARGET_QVGS})
|
source_group("generated" FILES ${TARGET_QVGS})
|
||||||
source_group("svg" FILES ${TARGET_SVGS})
|
source_group("svg" FILES ${TARGET_SVGS})
|
||||||
|
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/QskExamples.cmake)
|
||||||
|
|
|
||||||
|
|
@ -13,12 +13,9 @@ set(TARGET_NAME tabview)
|
||||||
|
|
||||||
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
|
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES} ${TARGET_HEADERS})
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER examples)
|
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME}
|
target_link_libraries(${TARGET_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
qskinny
|
qskinny
|
||||||
qsktestsupport)
|
qsktestsupport)
|
||||||
|
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/QskExamples.cmake)
|
||||||
|
|
|
||||||
|
|
@ -5,12 +5,9 @@ set(TARGET_NAME thumbnails)
|
||||||
|
|
||||||
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES})
|
qt_add_executable(${TARGET_NAME} WIN32 MACOSX_BUNDLE ${TARGET_SOURCES})
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER examples)
|
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME}
|
target_link_libraries(${TARGET_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
qskinny
|
qskinny
|
||||||
qsktestsupport)
|
qsktestsupport)
|
||||||
|
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/QskExamples.cmake)
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,4 @@ target_link_libraries(${TARGET_NAME}
|
||||||
qskinny
|
qskinny
|
||||||
Qt::GuiPrivate)
|
Qt::GuiPrivate)
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME} PROPERTIES
|
|
||||||
AUTOMOC ON)
|
|
||||||
|
|
||||||
install(TARGETS ${TARGET_NAME} DESTINATION ${QSK_INSTALL_PLUGINS}/platforminputcontexts)
|
install(TARGETS ${TARGET_NAME} DESTINATION ${QSK_INSTALL_PLUGINS}/platforminputcontexts)
|
||||||
|
|
@ -30,7 +30,4 @@ target_link_libraries(${TARGET_NAME}
|
||||||
qskinny
|
qskinny
|
||||||
qsktestsupport)
|
qsktestsupport)
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
include(${CMAKE_SOURCE_DIR}/cmake/QskPlayground.cmake)
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER playground)
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,4 @@ target_link_libraries(${TARGET_NAME}
|
||||||
qskinny
|
qskinny
|
||||||
qsktestsupport)
|
qsktestsupport)
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
include(${CMAKE_SOURCE_DIR}/cmake/QskPlayground.cmake)
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER playground)
|
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,4 @@ target_link_libraries(${TARGET_NAME}
|
||||||
qskinny
|
qskinny
|
||||||
qsktestsupport)
|
qsktestsupport)
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
include(${CMAKE_SOURCE_DIR}/cmake/QskPlayground.cmake)
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER playground)
|
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,4 @@ if(TARGET quickshapes_private)
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
include(${CMAKE_SOURCE_DIR}/cmake/QskPlayground.cmake)
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER playground)
|
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,4 @@ target_link_libraries(${TARGET_NAME}
|
||||||
qsktestsupport
|
qsktestsupport
|
||||||
Qt::QuickWidgets)
|
Qt::QuickWidgets)
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
include(${CMAKE_SOURCE_DIR}/cmake/QskPlayground.cmake)
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER playground)
|
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,4 @@ target_link_libraries(${TARGET_NAME}
|
||||||
qskqmlexport
|
qskqmlexport
|
||||||
qsktestsupport)
|
qsktestsupport)
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
include(${CMAKE_SOURCE_DIR}/cmake/QskPlayground.cmake)
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER playground)
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,4 @@ target_link_libraries(${TARGET_NAME}
|
||||||
qskinny
|
qskinny
|
||||||
qsktestsupport)
|
qsktestsupport)
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
include(${CMAKE_SOURCE_DIR}/cmake/QskPlayground.cmake)
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER playground)
|
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ target_link_libraries(${TARGET_NAME}
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
set_target_properties(${TARGET_NAME}
|
||||||
PROPERTIES
|
PROPERTIES
|
||||||
AUTOMOC ON
|
AUTOMOC_MOC_OPTIONS --no-warnings
|
||||||
AUTOMOC_MOC_OPTIONS -nw
|
)
|
||||||
FOLDER playground)
|
|
||||||
|
include(${CMAKE_SOURCE_DIR}/cmake/QskPlayground.cmake)
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,4 @@ target_link_libraries(${TARGET_NAME}
|
||||||
qskinny
|
qskinny
|
||||||
qsktestsupport)
|
qsktestsupport)
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
include(${CMAKE_SOURCE_DIR}/cmake/QskPlayground.cmake)
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER playground)
|
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,4 @@ target_link_libraries(${TARGET_NAME}
|
||||||
qskqmlexport
|
qskqmlexport
|
||||||
qsktestsupport)
|
qsktestsupport)
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
include(${CMAKE_SOURCE_DIR}/cmake/QskPlayground.cmake)
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER playground)
|
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,4 @@ else()
|
||||||
Qt::WebEnginePrivate)
|
Qt::WebEnginePrivate)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
include(${CMAKE_SOURCE_DIR}/cmake/QskPlayground.cmake)
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER playground)
|
|
||||||
|
|
|
||||||
|
|
@ -15,10 +15,6 @@ list(APPEND TARGET_SOURCES
|
||||||
|
|
||||||
qt_add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS})
|
qt_add_library(${TARGET_NAME} SHARED ${TARGET_SOURCES} ${TARGET_HEADERS})
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
|
||||||
PROPERTIES
|
|
||||||
AUTOMOC ON)
|
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME}
|
target_link_libraries(${TARGET_NAME}
|
||||||
PRIVATE
|
PRIVATE
|
||||||
qskinny)
|
qskinny)
|
||||||
|
|
|
||||||
|
|
@ -11,13 +11,16 @@ list(APPEND TARGET_SOURCES
|
||||||
QskMaterial3Skin.cpp
|
QskMaterial3Skin.cpp
|
||||||
QskMaterial3SkinFactory.cpp)
|
QskMaterial3SkinFactory.cpp)
|
||||||
|
|
||||||
|
list(APPEND TARGET_RESSOURCES
|
||||||
|
icons.qrc )
|
||||||
|
|
||||||
list(APPEND TARGET_OTHER_FILES
|
list(APPEND TARGET_OTHER_FILES
|
||||||
metadata.json)
|
metadata.json)
|
||||||
|
|
||||||
if(BUILD_QSKDLL)
|
if(BUILD_QSKDLL)
|
||||||
qt_add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
|
qt_add_library(${TARGET_NAME} SHARED ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_RESSOURCES} ${TARGET_OTHER_FILES})
|
||||||
else()
|
else()
|
||||||
qt_add_library(${TARGET_NAME} STATIC ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_OTHER_FILES})
|
qt_add_library(${TARGET_NAME} STATIC ${TARGET_HEADERS} ${TARGET_SOURCES} ${TARGET_RESSOURCES} ${TARGET_OTHER_FILES})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME} PRIVATE qskinny)
|
target_link_libraries(${TARGET_NAME} PRIVATE qskinny)
|
||||||
|
|
@ -29,7 +32,6 @@ if(BUILD_QSKDLL)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME} PROPERTIES
|
set_target_properties(${TARGET_NAME} PROPERTIES
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER skins)
|
FOLDER skins)
|
||||||
|
|
||||||
install(TARGETS ${TARGET_NAME} DESTINATION ${QSK_INSTALL_PLUGINS}/${QSK_PLUGIN_SUBDIR})
|
install(TARGETS ${TARGET_NAME} DESTINATION ${QSK_INSTALL_PLUGINS}/${QSK_PLUGIN_SUBDIR})
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,6 @@ if(BUILD_QSKDLL)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME} PROPERTIES
|
set_target_properties(${TARGET_NAME} PROPERTIES
|
||||||
AUTOMOC ON
|
|
||||||
FOLDER skins)
|
FOLDER skins)
|
||||||
|
|
||||||
install(TARGETS ${TARGET_NAME} DESTINATION ${QSK_INSTALL_PLUGINS}/${QSK_PLUGIN_SUBDIR})
|
install(TARGETS ${TARGET_NAME} DESTINATION ${QSK_INSTALL_PLUGINS}/${QSK_PLUGIN_SUBDIR})
|
||||||
|
|
|
||||||
|
|
@ -474,8 +474,6 @@ endif()
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME}
|
set_target_properties(${TARGET_NAME}
|
||||||
PROPERTIES
|
PROPERTIES
|
||||||
AUTOMOC ON
|
|
||||||
AUTORCC ON
|
|
||||||
FOLDER libs)
|
FOLDER libs)
|
||||||
|
|
||||||
# TODO hack for standalone qvg2svg
|
# TODO hack for standalone qvg2svg
|
||||||
|
|
|
||||||
|
|
@ -33,9 +33,6 @@ if(ENABLE_FONT_CONFIG)
|
||||||
FONTCONFIG_FILE=${QSK_FONTCONF_FILE})
|
FONTCONFIG_FILE=${QSK_FONTCONF_FILE})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME} PROPERTIES
|
|
||||||
AUTOMOC ON)
|
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME}
|
target_link_libraries(${TARGET_NAME}
|
||||||
PUBLIC
|
PUBLIC
|
||||||
qskinny)
|
qskinny)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue