Merge branch 'build-fix' into 'devel'

Fix Coriolis build on Arch Linux

See merge request vlsi-eda/coriolis!7
This commit is contained in:
Jean-Paul Chaput 2021-10-15 16:51:20 +00:00
commit 7cb8e20644
20 changed files with 21 additions and 7 deletions

View File

@ -3,7 +3,7 @@
set(CMAKE_LEGACY_CYGWIN_WIN32 0) set(CMAKE_LEGACY_CYGWIN_WIN32 0)
project(Bootstrap) project(Bootstrap)
cmake_minimum_required(VERSION 2.4.0) cmake_minimum_required(VERSION 2.8.0)
set(ignoreVariables USE_LIBBFD "${BUILD_DOC} ${CMAKE_INSTALL_DIR}") set(ignoreVariables USE_LIBBFD "${BUILD_DOC} ${CMAKE_INSTALL_DIR}")

View File

@ -22,6 +22,7 @@
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <qwt_scale_draw.h> #include <qwt_scale_draw.h>
#include <qwt_scale_map.h>
#include <qwt_scale_widget.h> #include <qwt_scale_widget.h>
#include <qwt_symbol.h> #include <qwt_symbol.h>
#include <qwt_plot_curve.h> #include <qwt_plot_curve.h>

View File

@ -17,6 +17,7 @@
#ifndef BORA_NODE_SETS_H #ifndef BORA_NODE_SETS_H
#define BORA_NODE_SETS_H #define BORA_NODE_SETS_H
#include <algorithm>
#include <cstddef> #include <cstddef>
#include <limits> #include <limits>
#include "BoxSet.h" #include "BoxSet.h"

View File

@ -9,6 +9,7 @@
#include <cassert> #include <cassert>
#include <numeric> #include <numeric>
#include <cmath> #include <cmath>
#include <limits>
namespace coloquinte{ namespace coloquinte{

View File

@ -4,6 +4,7 @@
#include <cassert> #include <cassert>
#include <stdexcept> #include <stdexcept>
#include <cmath> #include <cmath>
#include <limits>
namespace coloquinte{ namespace coloquinte{
namespace gp{ namespace gp{

View File

@ -9,6 +9,7 @@
#include <functional> #include <functional>
#include <cmath> #include <cmath>
#include <array> #include <array>
#include <limits>
namespace coloquinte{ namespace coloquinte{
using edge_t = std::pair<index_t, index_t>; using edge_t = std::pair<index_t, index_t>;

View File

@ -22,6 +22,8 @@
setup_boost(program_options) setup_boost(program_options)
setup_qt() setup_qt()
cmake_policy(SET CMP0054 NEW)
if (USE_LIBBFD) if (USE_LIBBFD)
find_package(Libbfd) find_package(Libbfd)
endif() endif()

View File

@ -17,6 +17,7 @@
#include "crlcore/VhdlBit.h" #include "crlcore/VhdlBit.h"
#include "crlcore/VhdlSignal.h" #include "crlcore/VhdlSignal.h"
#include <limits>
namespace Vhdl { namespace Vhdl {

View File

@ -16,6 +16,7 @@
#include "crlcore/SpiceBit.h" #include "crlcore/SpiceBit.h"
#include <limits>
namespace Spice { namespace Spice {

View File

@ -3,7 +3,7 @@
set(CMAKE_LEGACY_CYGWIN_WIN32 0) set(CMAKE_LEGACY_CYGWIN_WIN32 0)
project(CUMULUS) project(CUMULUS)
cmake_minimum_required(VERSION 2.4.0) cmake_minimum_required(VERSION 2.8.0)
set(ignoreVariables "${BUILD_DOC}" "${CMAKE_INSTALL_DIR}") set(ignoreVariables "${BUILD_DOC}" "${CMAKE_INSTALL_DIR}")
option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF)

View File

@ -17,6 +17,7 @@
list(INSERT CMAKE_MODULE_PATH 0 "${HURRICANE_SOURCE_DIR}/cmake_modules/") list(INSERT CMAKE_MODULE_PATH 0 "${HURRICANE_SOURCE_DIR}/cmake_modules/")
set_cmake_policies() set_cmake_policies()
cmake_policy(SET CMP0054 NEW)
setup_boost(program_options) setup_boost(program_options)
setup_qt() setup_qt()

View File

@ -302,7 +302,6 @@ extern "C" {
, .tp_basicsize = sizeof(PyOneVoid) , .tp_basicsize = sizeof(PyOneVoid)
, .tp_itemsize = 0 , .tp_itemsize = 0
, .tp_dealloc = NULL , .tp_dealloc = NULL
, .tp_print = NULL
, .tp_getattr = NULL , .tp_getattr = NULL
, .tp_setattr = NULL , .tp_setattr = NULL
, .tp_as_async = NULL , .tp_as_async = NULL

View File

@ -38,6 +38,7 @@
#include "hurricane/Error.h" #include "hurricane/Error.h"
#include "hurricane/Warning.h" #include "hurricane/Warning.h"
#include <limits>
namespace Hurricane { namespace Hurricane {

View File

@ -40,6 +40,8 @@
#include "hurricane/Interval.h" #include "hurricane/Interval.h"
#include "hurricane/RbTree.h" #include "hurricane/RbTree.h"
#include <algorithm>
namespace Hurricane { namespace Hurricane {

View File

@ -81,7 +81,7 @@
add_custom_command ( OUTPUT def.tab.cpp add_custom_command ( OUTPUT def.tab.cpp
DEPENDS ${DefParserGrammar} DEPENDS ${DefParserGrammar}
COMMAND ${BISON_EXECUTABLE} -v -p defyy -d ${DefParserGrammar} -o def.tab.cpp COMMAND ${BISON_EXECUTABLE} -v -p defyy -d ${DefParserGrammar} -o def.tab.cpp
COMMAND mv def.tab.hpp ${LEFDEF_SOURCE_DIR}/src/def/def/def.tab.h #COMMAND mv def.tab.hpp ${LEFDEF_SOURCE_DIR}/src/def/def/def.tab.h
#COMMAND mv def.tab.cpp ${LEFDEF_SOURCE_DIR}/src/def/def/def.tab.cpp #COMMAND mv def.tab.cpp ${LEFDEF_SOURCE_DIR}/src/def/def/def.tab.cpp
COMMENT "Generating DEF parser (bison)" COMMENT "Generating DEF parser (bison)"
) )

View File

@ -61,7 +61,7 @@
add_custom_command ( OUTPUT lef.tab.cpp add_custom_command ( OUTPUT lef.tab.cpp
DEPENDS ${LefParserGrammar} DEPENDS ${LefParserGrammar}
COMMAND ${BISON_EXECUTABLE} -v -p lefyy -d ${LefParserGrammar} -o lef.tab.cpp COMMAND ${BISON_EXECUTABLE} -v -p lefyy -d ${LefParserGrammar} -o lef.tab.cpp
COMMAND mv lef.tab.hpp ${LEFDEF_SOURCE_DIR}/src/lef/lef/lef.tab.h #COMMAND mv lef.tab.hpp ${LEFDEF_SOURCE_DIR}/src/lef/lef/lef.tab.h
#COMMAND mv lef.tab.cpp ${LEFDEF_SOURCE_DIR}/src/lef/lef/lef.tab.cpp #COMMAND mv lef.tab.cpp ${LEFDEF_SOURCE_DIR}/src/lef/lef/lef.tab.cpp
COMMENT "Generating LEF parser (bison)" COMMENT "Generating LEF parser (bison)"
) )

View File

@ -2,7 +2,7 @@
project(OROSHI) project(OROSHI)
cmake_minimum_required(VERSION 2.4.0) cmake_minimum_required(VERSION 2.8.0)
option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF)
set(ignoreVariables "${CMAKE_INSTALL_DIR}") set(ignoreVariables "${CMAKE_INSTALL_DIR}")

View File

@ -8,7 +8,7 @@
set(ignoreVariables "${BUILD_DOC}" "${CMAKE_INSTALL_DIR}") set(ignoreVariables "${BUILD_DOC}" "${CMAKE_INSTALL_DIR}")
option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF) option(USE_LIBBFD "Link with BFD libraries to print stack traces" OFF)
cmake_minimum_required(VERSION 2.4.0) cmake_minimum_required(VERSION 2.8.0)
list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/") list(INSERT CMAKE_MODULE_PATH 0 "${DESTDIR}$ENV{CORIOLIS_TOP}/share/cmake/Modules/")
find_package(Bootstrap REQUIRED) find_package(Bootstrap REQUIRED)
setup_project_paths(CORIOLIS) setup_project_paths(CORIOLIS)

View File

@ -15,6 +15,7 @@
setup_project_paths(CORIOLIS) setup_project_paths(CORIOLIS)
set_cmake_policies() set_cmake_policies()
cmake_policy(SET CMP0054 NEW)
setup_sysconfdir("${CMAKE_INSTALL_PREFIX}") setup_sysconfdir("${CMAKE_INSTALL_PREFIX}")
setup_boost(program_options) setup_boost(program_options)
setup_qt() setup_qt()

View File

@ -16,6 +16,7 @@
print_cmake_module_path() print_cmake_module_path()
set_cmake_policies() set_cmake_policies()
cmake_policy(SET CMP0054 NEW)
check_distribution() check_distribution()
setup_sysconfdir("${CMAKE_INSTALL_PREFIX}") setup_sysconfdir("${CMAKE_INSTALL_PREFIX}")
setup_boost(program_options) setup_boost(program_options)