From 0155d31d5ae88b5a56f44457f23cbdd21d192d18 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Fri, 19 Jun 2020 15:58:13 +0200 Subject: [PATCH] fixing some subprojects --- .github/workflows/BuildTestsMacOS.yml | 4 ---- .github/workflows/BuildTestsUbuntu.yml | 4 ---- .github/workflows/BuildTestsWindows.yml | 4 ---- apps/sample/colorspace/colorspace.pro | 8 ++------ apps/sample/polygonmesh_dual/polygonmesh_dual.pro | 4 ---- 5 files changed, 2 insertions(+), 22 deletions(-) diff --git a/.github/workflows/BuildTestsMacOS.yml b/.github/workflows/BuildTestsMacOS.yml index 44dc0fe4..deff9659 100644 --- a/.github/workflows/BuildTestsMacOS.yml +++ b/.github/workflows/BuildTestsMacOS.yml @@ -12,10 +12,6 @@ jobs: - uses: actions/checkout@v2 - name: Install Qt uses: jurplel/install-qt-action@v2 -# - name: Install dependencies -# run: | -# sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev -# sudo apt-get install -y libxkbcommon-x11-0 patchelf - name: Build Tests run: | qmake apps/sample/sample.pro diff --git a/.github/workflows/BuildTestsUbuntu.yml b/.github/workflows/BuildTestsUbuntu.yml index 6a2d8dee..830d0750 100644 --- a/.github/workflows/BuildTestsUbuntu.yml +++ b/.github/workflows/BuildTestsUbuntu.yml @@ -12,10 +12,6 @@ jobs: - uses: actions/checkout@v2 - name: Install Qt uses: jurplel/install-qt-action@v2 -# - name: Install dependencies -# run: | -# sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev -# sudo apt-get install -y libxkbcommon-x11-0 patchelf - name: Build Tests run: | qmake apps/sample/sample.pro diff --git a/.github/workflows/BuildTestsWindows.yml b/.github/workflows/BuildTestsWindows.yml index c34f47dc..aa215f4a 100644 --- a/.github/workflows/BuildTestsWindows.yml +++ b/.github/workflows/BuildTestsWindows.yml @@ -23,10 +23,6 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 - name: Install Qt uses: jurplel/install-qt-action@v2 -# - name: Install dependencies -# run: | -# sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev libeigen3-dev libgmp-dev -# sudo apt-get install -y libxkbcommon-x11-0 patchelf - name: Build Tests run: | qmake apps/sample/sample.pro diff --git a/apps/sample/colorspace/colorspace.pro b/apps/sample/colorspace/colorspace.pro index cb5f1612..76787855 100644 --- a/apps/sample/colorspace/colorspace.pro +++ b/apps/sample/colorspace/colorspace.pro @@ -1,7 +1,3 @@ +include(../common.pri) TARGET = colorspace -LIBPATH += -DEPENDPATH += . -INCLUDEPATH += . ../../.. -CONFIG += console stl -TEMPLATE = app -SOURCES += colorspace.cpp \ No newline at end of file +SOURCES += colorspace.cpp diff --git a/apps/sample/polygonmesh_dual/polygonmesh_dual.pro b/apps/sample/polygonmesh_dual/polygonmesh_dual.pro index e92bf0b3..169072de 100644 --- a/apps/sample/polygonmesh_dual/polygonmesh_dual.pro +++ b/apps/sample/polygonmesh_dual/polygonmesh_dual.pro @@ -1,7 +1,3 @@ -\macx: QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 -QMAKE_MAC_SDK = macosx10.9 -CONFIG += c++11 - include(../common.pri) TARGET = polygonmesh_base SOURCES += polygonmesh_dual.cpp ../../../wrap/ply/plylib.cpp