Skip to content

Commit 8e2875c

Browse files
committed
Fix for building on Fedora 26
1 parent 291dd65 commit 8e2875c

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,11 @@ if(EXISTS "/etc/redhat-release")
7171
endif(LINUX_ISSUE MATCHES "CentOS")
7272
if(LINUX_ISSUE MATCHES "Fedora")
7373
set(CPACK_GENERATOR "RPM")
74-
if(LINUX_ISSUE MATCHES "24")
74+
if(LINUX_ISSUE MATCHES "26")
75+
message("-- This is a Fedora 26 system")
76+
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, pcre, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive")
77+
set(CPACK_SYSTEM_NAME "fedora26")
78+
elseif(LINUX_ISSUE MATCHES "24")
7579
message("-- This is a Fedora 24 system")
7680
set(CPACK_RPM_PACKAGE_REQUIRES "python3-libs, pcre, gmp, libuuid, sqlite, gtkmm30, boost-system, boost-filesystem, boost-program-options, boost-regex, libstdc++, python3-matplotlib, dvipng, texlive")
7781
set(CPACK_SYSTEM_NAME "fedora24")

config/buildbot.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ function runbuild {
5757
#runbuild "Fedora_24_build" ".rpm" 7001 fedora24
5858
#runbuild "Mint_18" ".deb" 7002 mint18
5959
#runbuild "OpenSUSE_Leap" ".rpm" 7003 opensuse421
60-
runbuild "CentOS_7" ".rpm" 7004 centos7
61-
runbuild "Ubuntu_14.04_build" ".deb" 7005 ubuntu1404
60+
#runbuild "CentOS_7" ".rpm" 7004 centos7
61+
#runbuild "Ubuntu_14.04_build" ".deb" 7005 ubuntu1404
62+
runbuild "Fedora_26" ".rpm" 7011 fedora26
6263
#runbuild "Debian86" ".deb" 7006 debian86

0 commit comments

Comments
 (0)