update

softwareQinc · Nov 30, 2023 · 4367ac1 · 4367ac1
1 parent 7910a60
commit 4367ac1
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -109,10 +109,8 @@ if (STAQ_INSTALL_SOURCES)
             "cmake/staqConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/staqConfig.cmake"
             INSTALL_DESTINATION "lib/cmake/${PROJECT_NAME}"
     )
-    install(FILES "${CMAKE_SOURCE_DIR}/cmake/FindGMP.cmake" DESTINATION "lib/cmake/${PROJECT_NAME}")
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/staqConfig.cmake" DESTINATION "lib/cmake/${PROJECT_NAME}")
-    install(FILES "${CMAKE_SOURCE_DIR}/cmake/staq_grid_synth.cmake" DESTINATION "lib/cmake/${PROJECT_NAME}")
-    install(FILES "${CMAKE_SOURCE_DIR}/cmake/staq_msvc.cmake" DESTINATION "lib/cmake/${PROJECT_NAME}")
+    install(FILES "${CMAKE_SOURCE_DIR}/cmake/staq_msvc_pthread.cmake" DESTINATION "lib/cmake/${PROJECT_NAME}")
 endif ()
 
 #### Uninstall

diff --git a/cmake/FindGMP.cmake b/cmake/FindGMP.cmake
@@ -1,5 +1,7 @@
 set(GMP_PREFIX "" CACHE PATH "path ")
 
+list(APPEND CMAKE_MODULE_PATH "/usr/local/lib/cmake/staq")
+
 find_path(GMP_INCLUDE_DIR gmp.h gmpxx.h 
     PATHS ${GMP_PREFIX}/include /usr/include /usr/local/include
     /opt/homebrew/include)

diff --git a/cmake/staq_grid_synth.cmake → cmake/grid_synth.cmake b/cmake/staq_grid_synth.cmake → cmake/grid_synth.cmake
diff --git a/cmake/staqConfig.cmake.in b/cmake/staqConfig.cmake.in
@@ -1,8 +1,6 @@
 @PACKAGE_INIT@
 
 set(STAQ_INSTALL_DIR "@STAQ_INSTALL_DIR@")
-include("${CMAKE_CURRENT_LIST_DIR}/FindGMP.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/staq_grid_synth.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/staq_msvc.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/staq_msvc_pthread.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/staq_targets.cmake")
 message(STATUS "Found staq's source code in @STAQ_INSTALL_DIR@")
diff --git a/cmake/staq_msvc.cmake b/cmake/staq_msvc.cmake
diff --git a/cmake/staq_msvc_pthread.cmake b/cmake/staq_msvc_pthread.cmake
@@ -0,0 +1,4 @@
+#### Microsoft Visual Studio lack of pthread.h
+if (MSVC)
+    include_directories(SYSTEM ${STAQ_INSTALL_DIR}/third_party/pthreadwin32)
+endif ()
diff --git a/examples/standalone/CMakeLists.txt b/examples/standalone/CMakeLists.txt
@@ -11,6 +11,7 @@ set(CMAKE_CXX_STANDARD 17)
 # set(CMAKE_PREFIX_PATH "/path/to/installed/staq")
 
 find_package(staq REQUIRED)
+#find_package(GMP REQUIRED)
 
 add_executable(standalone src/main.cpp)
 target_link_libraries(standalone PUBLIC libstaq)
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
@@ -3,7 +3,7 @@ file(GLOB FILENAMES *.cpp)
 add_custom_target(tools COMMENT "Build all binary tools.")
 
 message(WARNING "tools")
-include(${CMAKE_SOURCE_DIR}/cmake/staq_grid_synth.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/grid_synth.cmake)
 
 foreach (filename ${FILENAMES})
     get_filename_component(basename ${filename} NAME_WE)

diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
@@ -21,7 +21,7 @@ aux_source_directory(tests/mapping TEST_FILES)
 aux_source_directory(tests/synthesis TEST_FILES)
 
 message(WARNING "unit_tests")
-include(${CMAKE_SOURCE_DIR}/cmake/staq_grid_synth.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/grid_synth.cmake)
 if (${BUILD_GRID_SYNTH})
     aux_source_directory(tests/grid_synth TEST_FILES)
 endif ()