From ef3a337940a04cb25d695a35b8de8c4579cc249e Mon Sep 17 00:00:00 2001 From: Thomas Prampart Date: Fri, 6 Nov 2020 16:36:05 +0100 Subject: [PATCH 1/5] Fedora Support: Add dependencies list --- scripts/linux-dependencies-fedora.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 scripts/linux-dependencies-fedora.txt diff --git a/scripts/linux-dependencies-fedora.txt b/scripts/linux-dependencies-fedora.txt new file mode 100644 index 000000000..abfd85daa --- /dev/null +++ b/scripts/linux-dependencies-fedora.txt @@ -0,0 +1,23 @@ +ogre-devel +wget +automake +autoconf +unzip +gcc-gfortran +gsl-devel +readline-devel +libtool +libXaw-devel +pcre-devel +freeimage-devel +mesa-libGL-devel +freealut-devel +libvorbis-devel +eigen3-devel +cegui-devel +ois-devel +compat-lua +sqlite2-devel +fftw-devel +python3-devel +python3-numpy -- GitLab From 21661777fd20632b15e2a7f3ac596cffcd1e938e Mon Sep 17 00:00:00 2001 From: Thomas Prampart Date: Fri, 6 Nov 2020 16:36:35 +0100 Subject: [PATCH 2/5] Fix includes for Fedora build --- .../src/box-algorithms/ovpCBoxAlgorithmLuaStimulator.h | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/processing/stimulation/src/box-algorithms/ovpCBoxAlgorithmLuaStimulator.h b/plugins/processing/stimulation/src/box-algorithms/ovpCBoxAlgorithmLuaStimulator.h index e43836d66..21e007d51 100644 --- a/plugins/processing/stimulation/src/box-algorithms/ovpCBoxAlgorithmLuaStimulator.h +++ b/plugins/processing/stimulation/src/box-algorithms/ovpCBoxAlgorithmLuaStimulator.h @@ -8,6 +8,7 @@ #include #include +#include #include #include -- GitLab From eb1b4fac5f15236c1e81190b1d8800d0b8610b9d Mon Sep 17 00:00:00 2001 From: Thomas Prampart Date: Tue, 17 Nov 2020 12:23:56 +0100 Subject: [PATCH 3/5] Fedora: update lua dependency --- scripts/linux-dependencies-fedora.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/linux-dependencies-fedora.txt b/scripts/linux-dependencies-fedora.txt index abfd85daa..2ddb93f63 100644 --- a/scripts/linux-dependencies-fedora.txt +++ b/scripts/linux-dependencies-fedora.txt @@ -16,7 +16,7 @@ libvorbis-devel eigen3-devel cegui-devel ois-devel -compat-lua +lua-devel sqlite2-devel fftw-devel python3-devel -- GitLab From c9e7bb31762c7392d392336637dac837d0b61a45 Mon Sep 17 00:00:00 2001 From: Thomas Prampart Date: Fri, 20 Nov 2020 15:11:19 +0100 Subject: [PATCH 4/5] Fedora: downgrade default lua5.3 to lua5.1 --- scripts/linux-dependencies-fedora.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/linux-dependencies-fedora.txt b/scripts/linux-dependencies-fedora.txt index 2ddb93f63..66c6f716c 100644 --- a/scripts/linux-dependencies-fedora.txt +++ b/scripts/linux-dependencies-fedora.txt @@ -16,7 +16,7 @@ libvorbis-devel eigen3-devel cegui-devel ois-devel -lua-devel +compat-lua-devel sqlite2-devel fftw-devel python3-devel -- GitLab From 2b74a20ce52e778423e2b870a3bfafb3a6906245 Mon Sep 17 00:00:00 2001 From: Thomas Prampart Date: Mon, 23 Nov 2020 15:29:32 +0100 Subject: [PATCH 5/5] Fedora: update find itpp as it is installed in deps dir --- cmake-modules/FindThirdPartyITPP.cmake | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cmake-modules/FindThirdPartyITPP.cmake b/cmake-modules/FindThirdPartyITPP.cmake index 7261a5655..c3b19c4e4 100644 --- a/cmake-modules/FindThirdPartyITPP.cmake +++ b/cmake-modules/FindThirdPartyITPP.cmake @@ -50,7 +50,16 @@ ENDIF(WIN32) IF(UNIX) INCLUDE("FindThirdPartyPkgConfig") - pkg_check_modules(ITPP itpp) + FIND_PATH(PATH_ITPP include/itpp PATHS ${LIST_DEPENDENCIES_PATH}) + + IF(PATH_ITPP) + SET(ITPP_FOUND TRUE) + SET(ITPP_INCLUDE_DIRS ${PATH_ITPP}/include/) + SET(ITPP_LIBRARY_DIRS ${PATH_ITPP}/lib/) + SET(ITPP_LIBRARY_RELEASE libitpp.so) + ELSE() + pkg_check_modules(ITPP itpp) + ENDIF() ENDIF(UNIX) IF(ITPP_FOUND) -- GitLab