diff --git a/.gitignore b/.gitignore index 5a3e3088..608ba52b 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ build/* # others .DS_Store +.cache/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cdad317..54867185 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,7 +77,13 @@ if(MSVC) set(BUILD_SHARED_LIBS TRUE) set(CMAKE_CXX_FLAGS "/std:c++17 ${CMAKE_CXX_FLAGS}") else() - set(CMAKE_CXX_FLAGS "-fPIC ${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "-fPIC -std=c++17 ${CMAKE_CXX_FLAGS}") + if(APPLE) + # Add macOS SDK paths for standard library headers + execute_process(COMMAND xcrun --show-sdk-path OUTPUT_VARIABLE MACOS_SDK_PATH OUTPUT_STRIP_TRAILING_WHITESPACE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isysroot ${MACOS_SDK_PATH}") + include_directories(SYSTEM ${MACOS_SDK_PATH}/usr/include/c++/v1) + endif() endif() # if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") diff --git a/src/test/test_apply_xfer.cpp b/src/test/test_apply_xfer.cpp index bce0b970..a270a947 100644 --- a/src/test/test_apply_xfer.cpp +++ b/src/test/test_apply_xfer.cpp @@ -93,5 +93,5 @@ int main() { } } - best_graph->to_qasm("test.qasm", false, false); + best_graph->to_qasm(std::string("test.qasm"), false, false); } diff --git a/src/test/test_from_and_to_qasm.cpp b/src/test/test_from_and_to_qasm.cpp index 241adecd..e6558a78 100644 --- a/src/test/test_from_and_to_qasm.cpp +++ b/src/test/test_from_and_to_qasm.cpp @@ -16,5 +16,5 @@ int main() { // GateType::rxx3}); auto graph = Graph::from_qasm_file(&ctx, "../experiment/nam_rm_circs/gf2^6_mult.qasm"); - graph->to_qasm("test.qasm", false, false); + graph->to_qasm(std::string("test.qasm"), false, false); } diff --git a/src/test/test_graph_to_qasm.cpp b/src/test/test_graph_to_qasm.cpp index b0bcfc70..08a3ca3d 100644 --- a/src/test/test_graph_to_qasm.cpp +++ b/src/test/test_graph_to_qasm.cpp @@ -17,6 +17,6 @@ int main() { } Graph graph(&ctx, dag); - graph.to_qasm("temp.qasm", /*print_result=*/true, true); + graph.to_qasm(std::string("temp.qasm"), /*print_result=*/true, true); graph.draw_circuit("temp.qasm", "temp.png"); } diff --git a/src/test/test_rigetti_td_disabled.cpp b/src/test/test_rigetti_td_disabled.cpp index 031dd4d9..2c3310f4 100644 --- a/src/test/test_rigetti_td_disabled.cpp +++ b/src/test/test_rigetti_td_disabled.cpp @@ -83,7 +83,8 @@ int main(int argc, char **argv) { &union_ctx_0, eqs_h_cz, fn, /*print_message=*/ true); graph_after_h_cz_merge->to_qasm( - "circuit/voqc-benchmarks/after_h_cz_merge.qasm", false, false); + std::string("circuit/voqc-benchmarks/after_h_cz_merge.qasm"), false, + false); // Shift the context to Rigetti Agave RuleParser rules({"h q0 = rx q0 pi; rz q0 0.5pi; rx q0 0.5pi; rz q0 -0.5pi;",