From fe345a7c79252ec22609e2eaf78a246249b87e00 Mon Sep 17 00:00:00 2001 From: Rick Vogel Date: Wed, 2 Nov 2022 09:18:23 +0100 Subject: [PATCH] add display environment variable --- .github/workflows/cmake.yml | 6 +++++- CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index e81e1af7..61107c5e 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -20,7 +20,7 @@ jobs: artifact: "windows_msvc.7z", build_type: "Release", cc: "cl", - cxx: "cl", + cxx: "cl", environment_script: "C:/Program Files/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat", archiver: "7z a", generators: "Visual Studio 17 2022", @@ -91,6 +91,7 @@ jobs: cxx: "g++", archiver: "7z a", generators: "Ninja", + env: { DISPLAY: ":1" }, cmake: { qtversion: "5.15.2", @@ -107,6 +108,7 @@ jobs: cxx: "g++", archiver: "7z a", generators: "Ninja", + env: { DISPLAY: ":1" }, cmake: { qtversion: "6.2.4", @@ -123,6 +125,7 @@ jobs: cxx: "g++", archiver: "7z a", generators: "Ninja", + env: { DISPLAY: ":1" }, cmake: { qtversion: "5.15.2", @@ -139,6 +142,7 @@ jobs: cxx: "g++", archiver: "7z a", generators: "Ninja", + env: { DISPLAY: ":1" }, cmake: { qtversion: "6.2.4", diff --git a/CMakeLists.txt b/CMakeLists.txt index 1abea989..99d35c38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,7 @@ set(CMAKE_INSTALL_BINDIR ${QSK_INSTALL_BINS}$<$:/debug>) # define library install directory globally # set(CMAKE_INSTALL_LIBDIR lib$<$:/debug>) # define install rpath globally -set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${QSK_INSTALL_LIBS}) +# set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${QSK_INSTALL_LIBS}) add_subdirectory(src) add_subdirectory(skins)