Skip to content

1021 Error when compiling on Mac with new boost #1146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavidKerkmann merged 4 commits into from
Nov 26, 2024
Merged

1021 Error when compiling on Mac with new boost #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc38926
change ignored warning for possibly better portability
reneSchm Nov 19, 2024
bdebe43
try to treat AppleClang as Clang, but warn about missing support
reneSchm Nov 26, 2024
e8bb6c5
replace vector<bool> with array to side step a libc++ extension
reneSchm Nov 26, 2024
17ac917
replace another vector<bool>
reneSchm Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ option(MEMILIO_ENABLE_PROFILING "Enable runtime performance profiling of memilio

mark_as_advanced(MEMILIO_USE_BUNDLED_SPDLOG MEMILIO_SANITIZE_ADDRESS MEMILIO_SANITIZE_UNDEFINED)

# try to treat AppleClang as Clang, but warn about missing support
if (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
message(WARNING "The compiler ID \"AppleClang\" is not supported, trying to compile with \"Clang\" options.")
set(CMAKE_CXX_COMPILER_ID "Clang")
endif()

set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
set(CMAKE_POSITION_INDEPENDENT_CODE ON)

Expand Down
5 changes: 3 additions & 2 deletions cpp/tests/test_abm_serialization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "models/abm/person.h"
#include "models/abm/trip_list.h"
#include "models/abm/model.h"
#include <cstddef>

#ifdef MEMILIO_HAS_JSONCPP

Expand Down Expand Up @@ -125,10 +126,10 @@ TEST(TestAbmSerialization, TestingScheme)
unsigned i = 1; // counter s.t. members have different values

Json::Value testing_criteria;
std::vector<bool> ages_bits(mio::abm::MAX_NUM_AGE_GROUPS, false);
std::array<bool, mio::abm::MAX_NUM_AGE_GROUPS> ages_bits{}; // initialize to false
ages_bits[i++] = true;
testing_criteria["ages"]["bitset"] = mio::serialize_json(ages_bits).value();
std::vector<bool> inf_st_bits((size_t)mio::abm::InfectionState::Count, false);
std::array<bool, (size_t)mio::abm::InfectionState::Count> inf_st_bits{}; // initialize to false
inf_st_bits[i++] = true;
testing_criteria["infection_states"]["bitset"] = mio::serialize_json(inf_st_bits).value();

Expand Down
8 changes: 6 additions & 2 deletions cpp/thirdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,12 @@ if(MEMILIO_USE_BUNDLED_BOOST)
add_library(Boost::boost ALIAS boost)
target_include_directories(boost SYSTEM INTERFACE $<BUILD_INTERFACE:${boost_SOURCE_DIR}>)

if (NOT MSVC)
target_compile_options(boost INTERFACE "-Wno-c++20-attribute-extensions")
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 14)
target_compile_options(boost INTERFACE "-Wno-c++20-attribute-extensions")
else()
target_compile_options(boost INTERFACE "-Wno-c++20-extensions")
endif()
endif()

add_library(boost_disable_autolink INTERFACE)
Expand Down