From b2cd30409dfe76125e6b3a4f6f9ecac7e9e739f6 Mon Sep 17 00:00:00 2001
From: Kit Barton <kbarton@ca.ibm.com>
Date: Mon, 19 Dec 2022 18:40:01 -0500
Subject: [PATCH 1/3] Reorder find_package calss for gmp and mpfr.

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c8eb85a5..39bc0bd77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,8 +42,8 @@ enable_language(C CXX ASM)
 find_package(Python COMPONENTS Interpreter Development)
 find_package(qasm REQUIRED)
 find_package(mpc REQUIRED)
-find_package(mpfr REQUIRED)
 find_package(gmp REQUIRED)
+find_package(mpfr REQUIRED)
 find_package(nlohmann_json REQUIRED)
 find_package(libzip REQUIRED)
 find_package(GTest REQUIRED)

From 00a07d8665fde2bd9f77f492a5e6f181ee24a9dd Mon Sep 17 00:00:00 2001
From: Kit Barton <kbarton@ca.ibm.com>
Date: Mon, 19 Dec 2022 18:40:55 -0500
Subject: [PATCH 2/3] Add additional linker options for apple.

---
 cmake/apple-clang.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmake/apple-clang.cmake b/cmake/apple-clang.cmake
index f751c829e..f7491f376 100644
--- a/cmake/apple-clang.cmake
+++ b/cmake/apple-clang.cmake
@@ -34,3 +34,5 @@ endif()
 
 set (CMAKE_CXX_FLAGS_DEBUG "-g3 -O0")
 set (CMAKE_CXX_FLAGS_RELEASE "-g -O2")
+set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
+set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath -Wl,${qasm_LIB_DIRS}")

From e1202db80cd6637b0f23cd72d1dc17140794c81b Mon Sep 17 00:00:00 2001
From: Kit Barton <kbarton@ca.ibm.com>
Date: Mon, 19 Dec 2022 18:41:30 -0500
Subject: [PATCH 3/3] Add gmp_INCLUDE to include_directories.

---
 lib/API/CMakeLists.txt                | 1 +
 lib/Frontend/OpenQASM3/CMakeLists.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/API/CMakeLists.txt b/lib/API/CMakeLists.txt
index e823a84d1..cbd392563 100644
--- a/lib/API/CMakeLists.txt
+++ b/lib/API/CMakeLists.txt
@@ -11,5 +11,6 @@ set(LIBS
         qasm::qasm
         )
 target_link_libraries(QSSCAPI ${LIBS})
+target_include_directories(QSSCAPI PUBLIC ${gmp_INCLUDES})
 
 add_dependencies(QSSCAPI MLIRQUIRDialect)
diff --git a/lib/Frontend/OpenQASM3/CMakeLists.txt b/lib/Frontend/OpenQASM3/CMakeLists.txt
index ac3b3f837..935e97f38 100644
--- a/lib/Frontend/OpenQASM3/CMakeLists.txt
+++ b/lib/Frontend/OpenQASM3/CMakeLists.txt
@@ -7,6 +7,7 @@
 ADD_LIBRARY(QSSCVisitor BaseQASM3Visitor.cpp PrintQASM3Visitor.cpp QUIRGenQASM3Visitor.cpp QUIRVariableBuilder.cpp)
 include_directories(${OPENQASM_INCLUDE_DIR})
 include_directories(${PROJECT_SOURCE_DIR}/include)
+include_directories(${gmp_INCLUDES})
 
 target_link_libraries(QSSCVisitor
         qasm::qasm