From cde2df9f50f1b265af2f66fb04f79d0e6aff2c34 Mon Sep 17 00:00:00 2001 From: Luc Jaulmes Date: Tue, 6 May 2025 13:49:24 +0200 Subject: [PATCH 1/3] Install quest files to include/ directory Use configured config.h file --- CMakeLists.txt | 47 ++++++++++++++++++++------- quest/include/CMakeLists.txt | 5 +-- quest/include/{quest.h => quest.h.in} | 11 ++++++- 3 files changed, 47 insertions(+), 16 deletions(-) rename quest/include/{quest.h => quest.h.in} (88%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d48dcebb7..142b252dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,6 +67,22 @@ message(STATUS "Library will be named lib${LIB_NAME}. Set LIB_NAME to modify.") option(VERBOSE_LIB_NAME "Modify library name based on compilation configuration. Turned OFF by default." OFF) message(STATUS "Verbose library naming is turned ${VERBOSE_LIB_NAME}. Set VERBOSE_LIB_NAME to modify.") +if (VERBOSE_LIB_NAME) + # Same headers will be used for several verbosely-named libraries + set(MULTI_LIB_HEADERS 1) + function(compile_option VAR VALUE) + target_compile_definitions(QuEST PUBLIC ${VAR}=${VALUE}) + endfunction() +else() + # Headers will be used for a single library with a single valid configuration + set(MULTI_LIB_HEADERS 0) + function(compile_option VAR VALUE) + target_compile_definitions(QuEST PRIVATE ${VAR}=${VALUE}) + set(${VAR} ${VALUE}) + endfunction() +endif() + + # Precision set(FLOAT_PRECISION 2 CACHE @@ -253,8 +269,8 @@ target_include_directories(QuEST PUBLIC $ $ + $ $ - $ ) set_target_properties(QuEST PROPERTIES VERSION ${PROJECT_VERSION} @@ -283,7 +299,7 @@ target_compile_options(QuEST # Set user options -target_compile_definitions(QuEST PUBLIC FLOAT_PRECISION=${FLOAT_PRECISION}) +compile_option(FLOAT_PRECISION ${FLOAT_PRECISION}) if (ENABLE_MULTITHREADING) @@ -299,7 +315,7 @@ if (ENABLE_MULTITHREADING) message(FATAL_ERROR ${ErrorMsg}) endif() - target_compile_definitions(QuEST PUBLIC COMPILE_OPENMP=1) + compile_option(COMPILE_OPENMP 1) target_link_libraries(QuEST PRIVATE OpenMP::OpenMP_CXX @@ -317,14 +333,14 @@ else() target_compile_options(QuEST PRIVATE $<$:-Wno-unknown-pragmas>) endif() - target_compile_definitions(QuEST PUBLIC COMPILE_OPENMP=0) + compile_option(COMPILE_OPENMP 0) endif() if (ENABLE_DISTRIBUTION) find_package(MPI REQUIRED COMPONENTS CXX ) - target_compile_definitions(QuEST PUBLIC COMPILE_MPI=1) + compile_option(COMPILE_MPI 1) target_link_libraries(QuEST PRIVATE MPI::MPI_CXX @@ -333,7 +349,7 @@ if (ENABLE_DISTRIBUTION) string(CONCAT LIB_NAME ${LIB_NAME} "+mpi") endif() else() - target_compile_definitions(QuEST PUBLIC COMPILE_MPI=0) + compile_option(COMPILE_MPI 0) endif() if (ENABLE_CUDA) @@ -357,14 +373,14 @@ endif() if (ENABLE_CUQUANTUM) find_package(CUQUANTUM REQUIRED) - target_compile_definitions(QuEST PUBLIC COMPILE_CUQUANTUM=1) + compile_option(COMPILE_CUQUANTUM 1) target_link_libraries(QuEST PRIVATE CUQUANTUM::cuStateVec) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON) if (VERBOSE_LIB_NAME) string(CONCAT LIB_NAME ${LIB_NAME} "+cuquantum") endif() else() - target_compile_definitions(QuEST PUBLIC COMPILE_CUQUANTUM=0) + compile_option(COMPILE_CUQUANTUM 0) endif() if (ENABLE_HIP) @@ -384,7 +400,7 @@ if (ENABLE_HIP) find_package(HIP REQUIRED) message(STATUS "Found HIP: " ${HIP_VERSION}) - target_compile_definitions(QuEST PUBLIC COMPILE_CUQUANTUM=0) + compile_option(COMPILE_CUQUANTUM 0) target_link_libraries(QuEST PRIVATE hip::host) if (VERBOSE_LIB_NAME) @@ -393,9 +409,9 @@ if (ENABLE_HIP) endif() if (ENABLE_CUDA OR ENABLE_HIP) - target_compile_definitions(QuEST PUBLIC COMPILE_CUDA=1) + compile_option(COMPILE_CUDA 1) else() - target_compile_definitions(QuEST PUBLIC COMPILE_CUDA=0) + compile_option(COMPILE_CUDA 0) endif() if (ENABLE_DEPRECATED_API) @@ -552,6 +568,15 @@ install(FILES DESTINATION "${QuEST_INSTALL_CONFIGDIR}" ) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/include/quest.h" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +) + +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/quest/include" + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/quest" + FILES_MATCHING PATTERN "*.h" +) + install(EXPORT QuESTTargets FILE QuESTTargets.cmake NAMESPACE QuEST:: diff --git a/quest/include/CMakeLists.txt b/quest/include/CMakeLists.txt index 44b5325f6..aec6285ea 100644 --- a/quest/include/CMakeLists.txt +++ b/quest/include/CMakeLists.txt @@ -1,7 +1,4 @@ # @author Oliver Thomson Brown # @author Erich Essmann -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DESTINATION "${CMAKE_INSTALL_PREFIX}" - FILES_MATCHING PATTERN "*.h" -) +configure_file(quest.h.in "${CMAKE_BINARY_DIR}/include/quest.h" @ONLY) diff --git a/quest/include/quest.h b/quest/include/quest.h.in similarity index 88% rename from quest/include/quest.h rename to quest/include/quest.h.in index e3fde6756..383b42c04 100644 --- a/quest/include/quest.h +++ b/quest/include/quest.h.in @@ -30,6 +30,15 @@ #define QUEST_H +#if !@MULTI_LIB_HEADERS@ +#cmakedefine FLOAT_PRECISION @FLOAT_PRECISION@ +#cmakedefine01 COMPILE_MPI +#cmakedefine01 COMPILE_OPENMP +#cmakedefine01 COMPILE_CUDA +#cmakedefine01 COMPILE_CUQUANTUM +#endif + + // include version first so it is accessible to // debuggers in case a subsequent include fails #include "quest/include/version.h" @@ -60,4 +69,4 @@ -#endif // QUEST_H \ No newline at end of file +#endif // QUEST_H From a5f1ffccbd4b98c74f1d1bff85c3d90c8bafa67c Mon Sep 17 00:00:00 2001 From: Luc Jaulmes Date: Tue, 6 May 2025 17:57:08 +0200 Subject: [PATCH 2/3] Make cmake files respect LIB_NAME --- CMakeLists.txt | 10 +++++----- cmake/QuESTConfig.cmake.in | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 142b252dc..0b2cc5694 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -549,7 +549,7 @@ set(QuEST_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/QuEST") # Write QuESTConfigVersion.cmake write_basic_package_version_file( - "${CMAKE_CURRENT_BINARY_DIR}/QuESTConfigVersion.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}ConfigVersion.cmake" VERSION ${PROJECT_VERSION} COMPATIBILITY AnyNewerVersion ) @@ -557,14 +557,14 @@ write_basic_package_version_file( # Configure QuESTConfig.cmake (from template) configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/QuESTConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/QuESTConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}Config.cmake" INSTALL_DESTINATION "${QuEST_INSTALL_CONFIGDIR}" ) # Install them install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/QuESTConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/QuESTConfigVersion.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}ConfigVersion.cmake" DESTINATION "${QuEST_INSTALL_CONFIGDIR}" ) @@ -578,7 +578,7 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/quest/include" ) install(EXPORT QuESTTargets - FILE QuESTTargets.cmake + FILE "${LIB_NAME}Targets.cmake" NAMESPACE QuEST:: DESTINATION "${QuEST_INSTALL_CONFIGDIR}" ) diff --git a/cmake/QuESTConfig.cmake.in b/cmake/QuESTConfig.cmake.in index b28896e95..c41c91aa1 100644 --- a/cmake/QuESTConfig.cmake.in +++ b/cmake/QuESTConfig.cmake.in @@ -1,4 +1,4 @@ # @author Erich Essmann @PACKAGE_INIT@ -include("${CMAKE_CURRENT_LIST_DIR}/QuESTTargets.cmake") \ No newline at end of file +include("${CMAKE_CURRENT_LIST_DIR}/@LIB_NAME@Targets.cmake") From facbcfbcba784568051d2a224aa9006348098e3c Mon Sep 17 00:00:00 2001 From: Luc Jaulmes Date: Wed, 7 May 2025 11:48:33 +0200 Subject: [PATCH 3/3] Update tests and deprecated include paths for quest.h --- quest/include/deprecated.h | 2 +- tests/deprecated/test_calculations.cpp | 2 +- tests/deprecated/test_data_structures.cpp | 2 +- tests/deprecated/test_gates.cpp | 2 +- tests/deprecated/test_main.cpp | 2 +- tests/deprecated/test_operators.cpp | 2 +- tests/deprecated/test_state_initialisations.cpp | 2 +- tests/deprecated/test_unitaries.cpp | 2 +- tests/deprecated/test_utilities.cpp | 2 +- tests/deprecated/test_utilities.hpp | 2 +- tests/integration/densitymatrix.cpp | 2 +- tests/main.cpp | 2 +- tests/unit/calculations.cpp | 2 +- tests/unit/channels.cpp | 2 +- tests/unit/debug.cpp | 2 +- tests/unit/decoherence.cpp | 2 +- tests/unit/environment.cpp | 2 +- tests/unit/initialisations.cpp | 2 +- tests/unit/matrices.cpp | 2 +- tests/unit/operations.cpp | 2 +- tests/unit/paulis.cpp | 2 +- tests/unit/qureg.cpp | 2 +- tests/unit/types.cpp | 2 +- tests/utils/cache.cpp | 2 +- tests/utils/cache.hpp | 2 +- tests/utils/compare.cpp | 2 +- tests/utils/compare.hpp | 2 +- tests/utils/convert.cpp | 2 +- tests/utils/convert.hpp | 2 +- tests/utils/lists.cpp | 2 +- tests/utils/lists.hpp | 2 +- tests/utils/measure.cpp | 2 +- tests/utils/measure.hpp | 2 +- tests/utils/qmatrix.hpp | 2 +- tests/utils/qvector.hpp | 2 +- tests/utils/random.cpp | 2 +- tests/utils/random.hpp | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/quest/include/deprecated.h b/quest/include/deprecated.h index b26e94804..efd7afd9d 100644 --- a/quest/include/deprecated.h +++ b/quest/include/deprecated.h @@ -18,7 +18,7 @@ #ifndef DEPRECATED_H #define DEPRECATED_H -#include "quest/include/quest.h" +#include "quest.h" #include "stdlib.h" diff --git a/tests/deprecated/test_calculations.cpp b/tests/deprecated/test_calculations.cpp index 2bf738f0e..3ed8f560e 100644 --- a/tests/deprecated/test_calculations.cpp +++ b/tests/deprecated/test_calculations.cpp @@ -20,7 +20,7 @@ // warnings issued by its compilation #define INCLUDE_DEPRECATED_FUNCTIONS 1 #define DISABLE_DEPRECATION_WARNINGS 1 -#include "quest/include/quest.h" +#include "quest.h" #include "test_utilities.hpp" diff --git a/tests/deprecated/test_data_structures.cpp b/tests/deprecated/test_data_structures.cpp index 1cbd1b596..258d83f75 100644 --- a/tests/deprecated/test_data_structures.cpp +++ b/tests/deprecated/test_data_structures.cpp @@ -20,7 +20,7 @@ // warnings issued by its compilation #define INCLUDE_DEPRECATED_FUNCTIONS 1 #define DISABLE_DEPRECATION_WARNINGS 1 -#include "quest/include/quest.h" +#include "quest.h" #include "test_utilities.hpp" diff --git a/tests/deprecated/test_gates.cpp b/tests/deprecated/test_gates.cpp index c10e22443..f8c175666 100644 --- a/tests/deprecated/test_gates.cpp +++ b/tests/deprecated/test_gates.cpp @@ -23,7 +23,7 @@ // warnings issued by its compilation #define INCLUDE_DEPRECATED_FUNCTIONS 1 #define DISABLE_DEPRECATION_WARNINGS 1 -#include "quest/include/quest.h" +#include "quest.h" #include "test_utilities.hpp" diff --git a/tests/deprecated/test_main.cpp b/tests/deprecated/test_main.cpp index db507da56..fc75d8190 100644 --- a/tests/deprecated/test_main.cpp +++ b/tests/deprecated/test_main.cpp @@ -21,7 +21,7 @@ #define INCLUDE_DEPRECATED_FUNCTIONS 1 #define DISABLE_DEPRECATION_WARNINGS 1 -#include "quest/include/quest.h" +#include "quest.h" #include "test_utilities.hpp" #include diff --git a/tests/deprecated/test_operators.cpp b/tests/deprecated/test_operators.cpp index 6e28ab584..6130ad3b8 100644 --- a/tests/deprecated/test_operators.cpp +++ b/tests/deprecated/test_operators.cpp @@ -20,7 +20,7 @@ // warnings issued by its compilation #define INCLUDE_DEPRECATED_FUNCTIONS 1 #define DISABLE_DEPRECATION_WARNINGS 1 -#include "quest/include/quest.h" +#include "quest.h" #include "test_utilities.hpp" diff --git a/tests/deprecated/test_state_initialisations.cpp b/tests/deprecated/test_state_initialisations.cpp index f961b8564..160721f7a 100644 --- a/tests/deprecated/test_state_initialisations.cpp +++ b/tests/deprecated/test_state_initialisations.cpp @@ -16,7 +16,7 @@ #define INCLUDE_DEPRECATED_FUNCTIONS 1 #define DISABLE_DEPRECATION_WARNINGS 1 -#include "quest/include/quest.h" +#include "quest.h" #include "test_utilities.hpp" diff --git a/tests/deprecated/test_unitaries.cpp b/tests/deprecated/test_unitaries.cpp index 1e86af330..6414880d1 100644 --- a/tests/deprecated/test_unitaries.cpp +++ b/tests/deprecated/test_unitaries.cpp @@ -20,7 +20,7 @@ // warnings issued by its compilation #define INCLUDE_DEPRECATED_FUNCTIONS 1 #define DISABLE_DEPRECATION_WARNINGS 1 -#include "quest/include/quest.h" +#include "quest.h" #include "test_utilities.hpp" diff --git a/tests/deprecated/test_utilities.cpp b/tests/deprecated/test_utilities.cpp index f8bf57376..27ef8af9f 100644 --- a/tests/deprecated/test_utilities.cpp +++ b/tests/deprecated/test_utilities.cpp @@ -11,7 +11,7 @@ #define INCLUDE_DEPRECATED_FUNCTIONS 1 #define DISABLE_DEPRECATION_WARNINGS 1 -#include "quest/include/quest.h" +#include "quest.h" #include "test_utilities.hpp" diff --git a/tests/deprecated/test_utilities.hpp b/tests/deprecated/test_utilities.hpp index cc9b815cf..8145c3f65 100644 --- a/tests/deprecated/test_utilities.hpp +++ b/tests/deprecated/test_utilities.hpp @@ -9,7 +9,7 @@ #ifndef QUEST_TEST_UTILS_H #define QUEST_TEST_UTILS_H -#include "quest/include/quest.h" +#include "quest.h" #include diff --git a/tests/integration/densitymatrix.cpp b/tests/integration/densitymatrix.cpp index d926ed7e6..2c28a934e 100644 --- a/tests/integration/densitymatrix.cpp +++ b/tests/integration/densitymatrix.cpp @@ -7,7 +7,7 @@ * @author Tyson Jones */ -#include "quest/include/quest.h" +#include "quest.h" #include #include diff --git a/tests/main.cpp b/tests/main.cpp index 190b58ef1..d2ddd52cc 100644 --- a/tests/main.cpp +++ b/tests/main.cpp @@ -49,7 +49,7 @@ #include #include -#include "quest/include/quest.h" +#include "quest.h" #include "tests/utils/cache.hpp" #include "tests/utils/macros.hpp" #include "tests/utils/random.hpp" diff --git a/tests/unit/calculations.cpp b/tests/unit/calculations.cpp index f5d30c757..e0b4e9962 100644 --- a/tests/unit/calculations.cpp +++ b/tests/unit/calculations.cpp @@ -7,7 +7,7 @@ * @ingroup unittests */ -#include "quest/include/quest.h" +#include "quest.h" #include #include diff --git a/tests/unit/channels.cpp b/tests/unit/channels.cpp index 1342402fd..b0a7ab314 100644 --- a/tests/unit/channels.cpp +++ b/tests/unit/channels.cpp @@ -7,7 +7,7 @@ * @ingroup unittests */ -#include "quest/include/quest.h" +#include "quest.h" #include #include diff --git a/tests/unit/debug.cpp b/tests/unit/debug.cpp index bc20a0a56..07a967493 100644 --- a/tests/unit/debug.cpp +++ b/tests/unit/debug.cpp @@ -7,7 +7,7 @@ * @ingroup unittests */ -#include "quest/include/quest.h" +#include "quest.h" #include #include diff --git a/tests/unit/decoherence.cpp b/tests/unit/decoherence.cpp index cfa1328bd..5fc373a44 100644 --- a/tests/unit/decoherence.cpp +++ b/tests/unit/decoherence.cpp @@ -7,7 +7,7 @@ * @ingroup unittests */ -#include "quest/include/quest.h" +#include "quest.h" #include #include diff --git a/tests/unit/environment.cpp b/tests/unit/environment.cpp index 23c9af8bf..6fc6d21ec 100644 --- a/tests/unit/environment.cpp +++ b/tests/unit/environment.cpp @@ -7,7 +7,7 @@ * @ingroup unittests */ -#include "quest/include/quest.h" +#include "quest.h" #include #include diff --git a/tests/unit/initialisations.cpp b/tests/unit/initialisations.cpp index e42fd099d..90a27ad75 100644 --- a/tests/unit/initialisations.cpp +++ b/tests/unit/initialisations.cpp @@ -7,7 +7,7 @@ * @ingroup unittests */ -#include "quest/include/quest.h" +#include "quest.h" #include #include diff --git a/tests/unit/matrices.cpp b/tests/unit/matrices.cpp index 01db8bddd..591e3bc7b 100644 --- a/tests/unit/matrices.cpp +++ b/tests/unit/matrices.cpp @@ -7,7 +7,7 @@ * @ingroup unittests */ -#include "quest/include/quest.h" +#include "quest.h" #include #include diff --git a/tests/unit/operations.cpp b/tests/unit/operations.cpp index 6f168d05f..6676dfba9 100644 --- a/tests/unit/operations.cpp +++ b/tests/unit/operations.cpp @@ -15,7 +15,7 @@ * @ingroup unittests */ -#include "quest/include/quest.h" +#include "quest.h" #include #include diff --git a/tests/unit/paulis.cpp b/tests/unit/paulis.cpp index 6d955fed2..f18b57228 100644 --- a/tests/unit/paulis.cpp +++ b/tests/unit/paulis.cpp @@ -7,7 +7,7 @@ * @ingroup unittests */ -#include "quest/include/quest.h" +#include "quest.h" #include #include diff --git a/tests/unit/qureg.cpp b/tests/unit/qureg.cpp index e0febd18b..aaf3bb0cd 100644 --- a/tests/unit/qureg.cpp +++ b/tests/unit/qureg.cpp @@ -7,7 +7,7 @@ * @ingroup unittests */ -#include "quest/include/quest.h" +#include "quest.h" #include #include diff --git a/tests/unit/types.cpp b/tests/unit/types.cpp index d84c846f7..dfce4005c 100644 --- a/tests/unit/types.cpp +++ b/tests/unit/types.cpp @@ -7,7 +7,7 @@ * @ingroup unittests */ -#include "quest/include/quest.h" +#include "quest.h" #include #include diff --git a/tests/utils/cache.cpp b/tests/utils/cache.cpp index b49b3c417..21dee8482 100644 --- a/tests/utils/cache.cpp +++ b/tests/utils/cache.cpp @@ -5,7 +5,7 @@ * @author Tyson Jones */ -#include "quest/include/quest.h" +#include "quest.h" #include "macros.hpp" #include "qvector.hpp" diff --git a/tests/utils/cache.hpp b/tests/utils/cache.hpp index 15bfb969d..ec8c71c7e 100644 --- a/tests/utils/cache.hpp +++ b/tests/utils/cache.hpp @@ -12,7 +12,7 @@ #ifndef CACHE_HPP #define CACHE_HPP -#include "quest/include/quest.h" +#include "quest.h" #include "qvector.hpp" #include "qmatrix.hpp" diff --git a/tests/utils/compare.cpp b/tests/utils/compare.cpp index 59be83bf2..c35585434 100644 --- a/tests/utils/compare.cpp +++ b/tests/utils/compare.cpp @@ -12,7 +12,7 @@ #include "linalg.hpp" #include "macros.hpp" -#include "quest/include/quest.h" +#include "quest.h" #include #include diff --git a/tests/utils/compare.hpp b/tests/utils/compare.hpp index e8e8e9fd9..028b72020 100644 --- a/tests/utils/compare.hpp +++ b/tests/utils/compare.hpp @@ -13,7 +13,7 @@ #ifndef COMPARE_HPP #define COMPARE_HPP -#include "quest/include/quest.h" +#include "quest.h" #include "qvector.hpp" #include "qmatrix.hpp" diff --git a/tests/utils/convert.cpp b/tests/utils/convert.cpp index b5bea9429..7d425d50b 100644 --- a/tests/utils/convert.cpp +++ b/tests/utils/convert.cpp @@ -12,7 +12,7 @@ #include "macros.hpp" #include "lists.hpp" -#include "quest/include/quest.h" +#include "quest.h" #include using std::is_same_v; diff --git a/tests/utils/convert.hpp b/tests/utils/convert.hpp index 1d170e432..6d5b4167c 100644 --- a/tests/utils/convert.hpp +++ b/tests/utils/convert.hpp @@ -13,7 +13,7 @@ #ifndef CONVERT_HPP #define CONVERT_HPP -#include "quest/include/quest.h" +#include "quest.h" #include "qvector.hpp" #include "qmatrix.hpp" diff --git a/tests/utils/lists.cpp b/tests/utils/lists.cpp index a3760ad00..aa20f34db 100644 --- a/tests/utils/lists.cpp +++ b/tests/utils/lists.cpp @@ -8,7 +8,7 @@ #include #include -#include "quest/include/quest.h" +#include "quest.h" #include "lists.hpp" #include "macros.hpp" diff --git a/tests/utils/lists.hpp b/tests/utils/lists.hpp index 4c37b9d80..082fd70ba 100644 --- a/tests/utils/lists.hpp +++ b/tests/utils/lists.hpp @@ -13,7 +13,7 @@ #include -#include "quest/include/quest.h" +#include "quest.h" #include #include diff --git a/tests/utils/measure.cpp b/tests/utils/measure.cpp index 41161675e..1d4246b60 100644 --- a/tests/utils/measure.cpp +++ b/tests/utils/measure.cpp @@ -6,7 +6,7 @@ * @author Tyson Jones */ -#include "quest/include/quest.h" +#include "quest.h" #include "qvector.hpp" #include "qmatrix.hpp" diff --git a/tests/utils/measure.hpp b/tests/utils/measure.hpp index f6061b32e..dd0716db4 100644 --- a/tests/utils/measure.hpp +++ b/tests/utils/measure.hpp @@ -13,7 +13,7 @@ #ifndef MEASURE_HPP #define MEASURE_HPP -#include "quest/include/quest.h" +#include "quest.h" #include "qvector.hpp" #include "qmatrix.hpp" diff --git a/tests/utils/qmatrix.hpp b/tests/utils/qmatrix.hpp index 0fadce493..a34d4322a 100644 --- a/tests/utils/qmatrix.hpp +++ b/tests/utils/qmatrix.hpp @@ -13,7 +13,7 @@ #ifndef QMATRIX_HPP #define QMATRIX_HPP -#include "quest/include/quest.h" +#include "quest.h" #include "qvector.hpp" #include diff --git a/tests/utils/qvector.hpp b/tests/utils/qvector.hpp index 90c24adc5..889f32a46 100644 --- a/tests/utils/qvector.hpp +++ b/tests/utils/qvector.hpp @@ -12,7 +12,7 @@ #ifndef QVECTOR_HPP #define QVECTOR_HPP -#include "quest/include/quest.h" +#include "quest.h" #include "macros.hpp" #include diff --git a/tests/utils/random.cpp b/tests/utils/random.cpp index b2cae350f..65d087518 100644 --- a/tests/utils/random.cpp +++ b/tests/utils/random.cpp @@ -15,7 +15,7 @@ #include "linalg.hpp" #include "lists.hpp" #include "random.hpp" -#include "quest/include/quest.h" +#include "quest.h" #include #include diff --git a/tests/utils/random.hpp b/tests/utils/random.hpp index 0c7261572..cbe6f63c2 100644 --- a/tests/utils/random.hpp +++ b/tests/utils/random.hpp @@ -17,7 +17,7 @@ #include "macros.hpp" #include "linalg.hpp" #include "lists.hpp" -#include "quest/include/quest.h" +#include "quest.h" #include using std::vector;