diff --git a/abc/src/misc/util/abc_global.h b/abc/src/misc/util/abc_global.h index 14523abd78b..94401abc848 100644 --- a/abc/src/misc/util/abc_global.h +++ b/abc/src/misc/util/abc_global.h @@ -84,6 +84,10 @@ #endif #endif +#ifdef __APPLE__ + #define ABC_USE_STDINT_H +#endif + #include "abc_namespaces.h" //////////////////////////////////////////////////////////////////////// diff --git a/cmake/modules/FindTBB.cmake b/cmake/modules/FindTBB.cmake index 0a1a5bb77ff..f2dbb400f6e 100644 --- a/cmake/modules/FindTBB.cmake +++ b/cmake/modules/FindTBB.cmake @@ -198,7 +198,7 @@ if(NOT TBB_FOUND) # Find TBB components ################################## - if(TBB_VERSION VERSION_LESS 4.3) + if(TBB_VERSION VERSION_LESS 4.3 AND NOT TBB_VERSION_MAJOR STREQUAL 2020) set(TBB_SEARCH_COMPOMPONENTS tbb_preview tbbmalloc tbb) else() set(TBB_SEARCH_COMPOMPONENTS tbb_preview tbbmalloc_proxy tbbmalloc tbb) diff --git a/libs/EXTERNAL/libtatum/cmake/modules/FindTBB.cmake b/libs/EXTERNAL/libtatum/cmake/modules/FindTBB.cmake index 0a1a5bb77ff..f2dbb400f6e 100644 --- a/libs/EXTERNAL/libtatum/cmake/modules/FindTBB.cmake +++ b/libs/EXTERNAL/libtatum/cmake/modules/FindTBB.cmake @@ -198,7 +198,7 @@ if(NOT TBB_FOUND) # Find TBB components ################################## - if(TBB_VERSION VERSION_LESS 4.3) + if(TBB_VERSION VERSION_LESS 4.3 AND NOT TBB_VERSION_MAJOR STREQUAL 2020) set(TBB_SEARCH_COMPOMPONENTS tbb_preview tbbmalloc tbb) else() set(TBB_SEARCH_COMPOMPONENTS tbb_preview tbbmalloc_proxy tbbmalloc tbb) diff --git a/libs/EXTERNAL/libtatum/libtatum/CMakeLists.txt b/libs/EXTERNAL/libtatum/libtatum/CMakeLists.txt index 64fd60241cd..35fb9d6c629 100644 --- a/libs/EXTERNAL/libtatum/libtatum/CMakeLists.txt +++ b/libs/EXTERNAL/libtatum/libtatum/CMakeLists.txt @@ -76,7 +76,7 @@ if (TATUM_USE_EXECUTION_ENGINE STREQUAL "tbb") target_compile_definitions(libtatum PUBLIC TATUM_USE_TBB) target_link_libraries(libtatum tbb) - target_link_libraries(libtatum tbbmalloc_proxy) #Use the scalable memory allocator + target_link_libraries(libtatum ${TBB_tbbmalloc_proxy_LIBRARY}) #Use the scalable memory allocator elseif (TATUM_USE_EXECUTION_ENGINE STREQUAL "serial") #Nothing to do diff --git a/libs/libarchfpga/src/arch_check.cpp b/libs/libarchfpga/src/arch_check.cpp index 58e8ced5b50..0b8f88e1f10 100644 --- a/libs/libarchfpga/src/arch_check.cpp +++ b/libs/libarchfpga/src/arch_check.cpp @@ -1,4 +1,5 @@ #include +#include #include "vtr_log.h" #include "arch_error.h" diff --git a/libs/libarchfpga/src/read_fpga_interchange_arch.cpp b/libs/libarchfpga/src/read_fpga_interchange_arch.cpp index 4d56a3f535b..b83fb737940 100644 --- a/libs/libarchfpga/src/read_fpga_interchange_arch.cpp +++ b/libs/libarchfpga/src/read_fpga_interchange_arch.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include "vtr_assert.h" #include "vtr_digest.h" diff --git a/libs/libvqm/vqm_common.c b/libs/libvqm/vqm_common.c index 5120d88a74b..57c905db58c 100644 --- a/libs/libvqm/vqm_common.c +++ b/libs/libvqm/vqm_common.c @@ -35,7 +35,9 @@ #include #include +#ifndef __APPLE__ #include +#endif #include #include #include "vqm_dll.h" diff --git a/libs/libvqm/vqm_dll.h b/libs/libvqm/vqm_dll.h index be56cede16c..63e228e3819 100644 --- a/libs/libvqm/vqm_dll.h +++ b/libs/libvqm/vqm_dll.h @@ -101,7 +101,9 @@ #include +#ifndef __APPLE__ #include +#endif /*****************************************************/ diff --git a/libs/libvqm/vqm_parser.y b/libs/libvqm/vqm_parser.y index 0f5af4754ad..b2f170a9308 100644 --- a/libs/libvqm/vqm_parser.y +++ b/libs/libvqm/vqm_parser.y @@ -21,7 +21,9 @@ #include #include //#include +#ifndef __APPLE__ #include +#endif #include #include #include "vqm_dll.h" diff --git a/utils/vqm2blif/src/base/preprocess.h b/utils/vqm2blif/src/base/preprocess.h index 70d24cbda5f..88b16f6e554 100644 --- a/utils/vqm2blif/src/base/preprocess.h +++ b/utils/vqm2blif/src/base/preprocess.h @@ -27,7 +27,7 @@ typedef struct s_split_inout_pin { struct cmp_str { - bool operator()(char const* a, char const* b) { + bool operator()(char const* a, char const* b) const { return strcmp(a, b) < 0; } }; diff --git a/vpr/CMakeLists.txt b/vpr/CMakeLists.txt index 2326313b439..05f82eddee8 100644 --- a/vpr/CMakeLists.txt +++ b/vpr/CMakeLists.txt @@ -232,7 +232,7 @@ endif() if (VPR_USE_EXECUTION_ENGINE STREQUAL "tbb") target_compile_definitions(libvpr PRIVATE VPR_USE_TBB) target_link_libraries(libvpr tbb) - target_link_libraries(libvpr tbbmalloc_proxy) #Use the scalable memory allocator + target_link_libraries(libvpr ${TBB_tbbmalloc_proxy_LIBRARY}) #Use the scalable memory allocator message(STATUS "VPR: will support parallel execution using '${VPR_USE_EXECUTION_ENGINE}'") elseif(VPR_USE_EXECUTION_ENGINE STREQUAL "serial") message(STATUS "VPR: will only support serial execution") diff --git a/vpr/src/base/read_interchange_netlist.cpp b/vpr/src/base/read_interchange_netlist.cpp index c3c323827f4..ea8fde550b7 100644 --- a/vpr/src/base/read_interchange_netlist.cpp +++ b/vpr/src/base/read_interchange_netlist.cpp @@ -15,6 +15,7 @@ #include #include #include +#include #include "LogicalNetlist.capnp.h" #include "capnp/serialize.h"