update

softwareQinc · Nov 29, 2023 · bf1ce85 · bf1ce85
1 parent b7b3cd0
commit bf1ce85
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -101,3 +101,6 @@ jobs:
 
       - name: Install pystaq
         run: pip3 install --user .
+
+      - name: Uninstall
+        run: cmake --build build --target uninstall
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -94,10 +94,10 @@ endif ()
 #### Installation (binaries)
 install(TARGETS ${COMPILER} DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-option(STAQ_INSTALL_SOURCES "Install staq's source code" OFF)
+option(STAQ_INSTALL_SOURCES "Enable staq's source code installation" OFF)
 
+#### Installation (source)
 if (STAQ_INSTALL_SOURCES)
-    #### Installation (source)
     set(STAQ_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}")
     install(DIRECTORY include/ DESTINATION ${STAQ_INSTALL_DIR})
     install(DIRECTORY qasmtools/include/ DESTINATION ${STAQ_INSTALL_DIR})

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -23,7 +23,8 @@ USER sq
 WORKDIR /home/sq
 RUN git clone --depth 1 --branch main https://github.com/softwareqinc/staq
 WORKDIR /home/sq/staq
-RUN cmake -B build  && cmake --build build --target all --parallel 4 && \
+RUN cmake -B build -DSTAQ_INSTALL_SOURCES=ON  && \
+    cmake --build build --target all --parallel 4 && \
     sudo cmake --build build --target install
 USER sq
 WORKDIR /home/sq

diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
@@ -9,7 +9,7 @@ if (MSVC)
         # gmp, gmpxx
         pkg_search_module(GMP gmp)
         pkg_search_module(GMPXX gmpxx)
-        if (GMP_FOUND AND GMMXX_FOUND)
+        if (GMP_FOUND AND GMPXX_FOUND)
             set(BUILD_GRID_SYNTH ON)
             add_compile_options("-DEXPR_GMP")
         endif ()