From 51b5c26813edd94603aacc1e1135cc3bf3328367 Mon Sep 17 00:00:00 2001 From: acpaquette Date: Thu, 17 Jul 2025 15:01:57 -0700 Subject: [PATCH 01/14] Change find_package for packages with config files --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c802856..6ce811d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,10 +55,10 @@ if(SPICEQL_BUILD_LIB) add_subdirectory("submodules/gularkfilesystem") add_subdirectory("submodules/json") - find_package(cspice REQUIRED) - find_package(fmt REQUIRED) - find_package(cereal REQUIRED) - find_package(spdlog REQUIRED) + find_package(cspice REQUIRED CONFIG) + find_package(fmt REQUIRED CONFIG) + find_package(cereal REQUIRED CONFIG) + find_package(spdlog REQUIRED CONFIG) find_package(HighFive REQUIRED) find_package(CURL REQUIRED) From 921c28d30205822d1420287786bb4fad3e8140ba Mon Sep 17 00:00:00 2001 From: acpaquette Date: Fri, 18 Jul 2025 13:15:54 -0700 Subject: [PATCH 02/14] Change "io" module to "spiceql_io" --- CMakeLists.txt | 10 +++++----- SpiceQL/include/spiceql.h | 2 +- SpiceQL/include/{io.h => spiceql_io.h} | 0 SpiceQL/src/{io.cpp => spiceql_io.cpp} | 2 +- SpiceQL/tests/Fixtures.cpp | 2 +- SpiceQL/tests/IoTests.cpp | 2 +- SpiceQL/tests/MemoTests.cpp | 2 +- bindings/python/io.i | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) rename SpiceQL/include/{io.h => spiceql_io.h} (100%) rename SpiceQL/src/{io.cpp => spiceql_io.cpp} (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ce811d..0f34e20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,10 +55,10 @@ if(SPICEQL_BUILD_LIB) add_subdirectory("submodules/gularkfilesystem") add_subdirectory("submodules/json") - find_package(cspice REQUIRED CONFIG) - find_package(fmt REQUIRED CONFIG) - find_package(cereal REQUIRED CONFIG) - find_package(spdlog REQUIRED CONFIG) + find_package(cspice REQUIRED) + find_package(fmt CONFIG REQUIRED) + find_package(cereal CONFIG REQUIRED) + find_package(spdlog CONFIG REQUIRED) find_package(HighFive REQUIRED) find_package(CURL REQUIRED) @@ -78,7 +78,7 @@ if(SPICEQL_BUILD_LIB) set(SPICEQL_HEADER_FILES ${SPICEQL_BUILD_INCLUDE_DIR}/spiceql.h ${SPICEQL_BUILD_INCLUDE_DIR}/utils.h ${SPICEQL_BUILD_INCLUDE_DIR}/memoized_functions.h - ${SPICEQL_BUILD_INCLUDE_DIR}/io.h + ${SPICEQL_BUILD_INCLUDE_DIR}/spiceql_io.h ${SPICEQL_BUILD_INCLUDE_DIR}/spice_types.h ${SPICEQL_BUILD_INCLUDE_DIR}/query.h ${SPICEQL_BUILD_INCLUDE_DIR}/config.h diff --git a/SpiceQL/include/spiceql.h b/SpiceQL/include/spiceql.h index 9303457..c84c9ad 100644 --- a/SpiceQL/include/spiceql.h +++ b/SpiceQL/include/spiceql.h @@ -9,7 +9,7 @@ #include "utils.h" #include "spice_types.h" -#include "io.h" +#include "spiceql_io.h" #include "query.h" #include "api.h" #include "inventory.h" diff --git a/SpiceQL/include/io.h b/SpiceQL/include/spiceql_io.h similarity index 100% rename from SpiceQL/include/io.h rename to SpiceQL/include/spiceql_io.h diff --git a/SpiceQL/src/io.cpp b/SpiceQL/src/spiceql_io.cpp similarity index 99% rename from SpiceQL/src/io.cpp rename to SpiceQL/src/spiceql_io.cpp index 0711a6b..8aad1a4 100644 --- a/SpiceQL/src/io.cpp +++ b/SpiceQL/src/spiceql_io.cpp @@ -5,7 +5,7 @@ #include -#include "io.h" +#include "spiceql_io.h" #include "utils.h" diff --git a/SpiceQL/tests/Fixtures.cpp b/SpiceQL/tests/Fixtures.cpp index a79ffa5..70740df 100644 --- a/SpiceQL/tests/Fixtures.cpp +++ b/SpiceQL/tests/Fixtures.cpp @@ -12,7 +12,7 @@ #include #include "utils.h" -#include "io.h" +#include "spiceql_io.h" #include "query.h" #include "inventory.h" diff --git a/SpiceQL/tests/IoTests.cpp b/SpiceQL/tests/IoTests.cpp index f9dc509..3244a3d 100644 --- a/SpiceQL/tests/IoTests.cpp +++ b/SpiceQL/tests/IoTests.cpp @@ -2,7 +2,7 @@ #include #include "Fixtures.h" -#include "io.h" +#include "spiceql_io.h" #include "utils.h" #include "api.h" diff --git a/SpiceQL/tests/MemoTests.cpp b/SpiceQL/tests/MemoTests.cpp index 9864586..e66ca6c 100644 --- a/SpiceQL/tests/MemoTests.cpp +++ b/SpiceQL/tests/MemoTests.cpp @@ -14,7 +14,7 @@ using namespace std::chrono; #include "memo.h" #include "memoized_functions.h" #include "spiceql.h" -#include "io.h" +#include "spiceql_io.h" #include "Fixtures.h" #include diff --git a/bindings/python/io.i b/bindings/python/io.i index decff1e..3291cc7 100644 --- a/bindings/python/io.i +++ b/bindings/python/io.i @@ -1,7 +1,7 @@ %module(package="pyspiceql") io %{ - #include "io.h" + #include "spiceql_io.h" %} -%include "io.h" \ No newline at end of file +%include "spiceql_io.h" \ No newline at end of file From 2e41e8108688719c42522cd4ac8863a6e7474a0a Mon Sep 17 00:00:00 2001 From: acpaquette Date: Fri, 18 Jul 2025 13:22:15 -0700 Subject: [PATCH 03/14] Reverted cspice find --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f34e20..4031bef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ if(SPICEQL_BUILD_LIB) add_subdirectory("submodules/gularkfilesystem") add_subdirectory("submodules/json") - find_package(cspice REQUIRED) + find_package(CSpice REQUIRED) find_package(fmt CONFIG REQUIRED) find_package(cereal CONFIG REQUIRED) find_package(spdlog CONFIG REQUIRED) From ca0b90b7d3de9efab4fccac4767e25c5d35d5b13 Mon Sep 17 00:00:00 2001 From: acpaquette Date: Fri, 18 Jul 2025 13:22:32 -0700 Subject: [PATCH 04/14] Added windows testing --- .github/workflows/ci_testing.yml | 38 ++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml index 4dd9015..b3b55f6 100644 --- a/.github/workflows/ci_testing.yml +++ b/.github/workflows/ci_testing.yml @@ -8,7 +8,7 @@ env: BUILD_TYPE: Release jobs: - build-library: + Build-and-Test-LinuxOsx: runs-on: ${{ matrix.os }} strategy: matrix: @@ -122,4 +122,38 @@ jobs: run: | test -e index.html - + Build-and-Test-Win: + runs-on: windows-2025 + strategy: + matrix: + python-version: ["3.10", "3.11", "3.12"] + steps: + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + with: + submodules: recursive + - uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 + with: + miniforge-version: latest + use-mamba: true + channels: conda-forge + activate-environment: spiceql + environment-file: environment.yml + auto-activate-base: false + auto-update-conda: true + python-version: ${{ matrix.python-version }} + - name: Check build environment + run: | + conda list + - name: Build Package + run: | + mkdir -p build + cd build + cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -G "Visual Studio 17 2022" -A x64 -DSPICEQL_BUILD_TESTS=OFF -DSPICEQL_BUILD_DOCS=OFF .. + cmake --build . --target ALL_BUILD --config Release + ls ${{ github.workspace }}\build\Release + - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 + with: + name: SpiceQL-py${{ matrix.python-version }} + path: | + ${{ github.workspace }}\build\Release\SpiceQL.dll + ${{ github.workspace }}\build\Release\SpiceQL.lib \ No newline at end of file From bda2277de399e00b3fea5778e13cdea672f30220 Mon Sep 17 00:00:00 2001 From: acpaquette Date: Fri, 18 Jul 2025 13:25:25 -0700 Subject: [PATCH 05/14] Missed io.cpp, changed to spiceql_io.cpp --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4031bef..17b4085 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ if(SPICEQL_BUILD_LIB) set(SPICEQL_INSTALL_INCLUDE_DIR "include/SpiceQL") set(SPICEQL_SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/spiceql.cpp ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/utils.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/io.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/spiceql_io.cpp ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/query.cpp ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/spice_types.cpp ${CMAKE_CURRENT_SOURCE_DIR}/SpiceQL/src/memoized_functions.cpp From 823a42f6c67e66d1af6049d81c8b03b3e16ffaf1 Mon Sep 17 00:00:00 2001 From: acpaquette Date: Fri, 18 Jul 2025 14:56:56 -0700 Subject: [PATCH 06/14] Change build agent from visual studio to Ninja --- .github/workflows/ci_testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml index b3b55f6..4ad3f7c 100644 --- a/.github/workflows/ci_testing.yml +++ b/.github/workflows/ci_testing.yml @@ -148,7 +148,7 @@ jobs: run: | mkdir -p build cd build - cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -G "Visual Studio 17 2022" -A x64 -DSPICEQL_BUILD_TESTS=OFF -DSPICEQL_BUILD_DOCS=OFF .. + cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -G Ninja -A x64 -DSPICEQL_BUILD_TESTS=OFF -DSPICEQL_BUILD_DOCS=OFF .. cmake --build . --target ALL_BUILD --config Release ls ${{ github.workspace }}\build\Release - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 From 78ca2f979d6e927aad9fdf8abd9b72ff6672be40 Mon Sep 17 00:00:00 2001 From: acpaquette Date: Fri, 18 Jul 2025 14:59:46 -0700 Subject: [PATCH 07/14] Remove platform x64 spec --- .github/workflows/ci_testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml index 4ad3f7c..c26a023 100644 --- a/.github/workflows/ci_testing.yml +++ b/.github/workflows/ci_testing.yml @@ -148,7 +148,7 @@ jobs: run: | mkdir -p build cd build - cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -G Ninja -A x64 -DSPICEQL_BUILD_TESTS=OFF -DSPICEQL_BUILD_DOCS=OFF .. + cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -G Ninja -DSPICEQL_BUILD_TESTS=OFF -DSPICEQL_BUILD_DOCS=OFF .. cmake --build . --target ALL_BUILD --config Release ls ${{ github.workspace }}\build\Release - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 From 718a08217a9d4b052eb47e2c2dc712d774789316 Mon Sep 17 00:00:00 2001 From: acpaquette Date: Fri, 18 Jul 2025 15:03:14 -0700 Subject: [PATCH 08/14] Changed build and install command --- .github/workflows/ci_testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml index c26a023..8073185 100644 --- a/.github/workflows/ci_testing.yml +++ b/.github/workflows/ci_testing.yml @@ -149,7 +149,7 @@ jobs: mkdir -p build cd build cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -G Ninja -DSPICEQL_BUILD_TESTS=OFF -DSPICEQL_BUILD_DOCS=OFF .. - cmake --build . --target ALL_BUILD --config Release + cmake --build . --target install --config Release ls ${{ github.workspace }}\build\Release - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 with: From 63630f6332adfb74af72f7974072e887d91d9edc Mon Sep 17 00:00:00 2001 From: acpaquette Date: Fri, 18 Jul 2025 15:19:59 -0700 Subject: [PATCH 09/14] Updated cereal link --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 17b4085..196d15a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,6 +153,7 @@ target_include_directories(SpiceQL PUBLIC fmt::fmt-header-only nlohmann_json::nlohmann_json + cereal::cereal PRIVATE CSPICE::cspice spdlog::spdlog_header_only From e46ef2281abf2deff7460b6fe9e1720e0e80dd44 Mon Sep 17 00:00:00 2001 From: acpaquette Date: Fri, 18 Jul 2025 15:45:52 -0700 Subject: [PATCH 10/14] Cleaned up C++ build warnings --- SpiceQL/src/query.cpp | 6 +++--- SpiceQL/src/spice_types.cpp | 2 +- SpiceQL/src/spiceql.cpp | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/SpiceQL/src/query.cpp b/SpiceQL/src/query.cpp index c2f81ef..01c06f6 100644 --- a/SpiceQL/src/query.cpp +++ b/SpiceQL/src/query.cpp @@ -72,9 +72,9 @@ namespace SpiceQL { // Comparator function for kernel paths bool fileNameComp(string a, string b) { - string fna = static_cast(a).filename(); - string fnb = static_cast(b).filename(); - int comp = fna.compare(fnb); + string fna = static_cast(a).filename().string(); + string fnb = static_cast(b).filename().string(); + int comp = fna.compare(fnb); SPDLOG_TRACE("Comparing {} and {}: {}", fna, fnb, comp); return comp < 0; } diff --git a/SpiceQL/src/spice_types.cpp b/SpiceQL/src/spice_types.cpp index 1c5478e..bded779 100644 --- a/SpiceQL/src/spice_types.cpp +++ b/SpiceQL/src/spice_types.cpp @@ -151,7 +151,7 @@ namespace SpiceQL { SPDLOG_TRACE("k is absolute"); } else { SPDLOG_TRACE("k is relative"); - k = data_dir / k; + k = fs::path(data_dir / k).string(); } SPDLOG_TRACE("Creating shared kernel {}", k); diff --git a/SpiceQL/src/spiceql.cpp b/SpiceQL/src/spiceql.cpp index 89e8eab..283ca46 100644 --- a/SpiceQL/src/spiceql.cpp +++ b/SpiceQL/src/spiceql.cpp @@ -41,7 +41,6 @@ namespace SpiceQL { // init with log level const char* log_level_char = getenv("SPICEQL_LOG_LEVEL"); string log_level_string; - spdlog::level::level_enum log_level; if (log_level_char != NULL) { log_level_string = log_level_char; @@ -68,7 +67,7 @@ namespace SpiceQL { auto max_size = 1048576 * 10; auto max_files = 5; try { - auto logger = spdlog::rotating_logger_mt("spiceql_file_log", log_file, max_size, max_files); + auto logger = spdlog::rotating_logger_mt("spiceql_file_log", log_file.string(), max_size, max_files); } catch (const spdlog::spdlog_ex &ex) { SPDLOG_ERROR("file log init failed: {}", ex.what()); @@ -79,7 +78,6 @@ namespace SpiceQL { SPDLOG_DEBUG("Using log dir: {}", log_dir); SPDLOG_DEBUG("Log level: {}", log_level_string); - SPDLOG_DEBUG("Log level enum: {}", int(log_level)); SPDLOG_TRACE("Log dir: {}", log_dir); } } From e4b6133b425b37d13052ecc6e119d3dd1b831b35 Mon Sep 17 00:00:00 2001 From: acpaquette Date: Fri, 18 Jul 2025 16:00:33 -0700 Subject: [PATCH 11/14] More windows cleanup --- .github/workflows/ci_testing.yml | 2 +- SpiceQL/include/memo.h | 4 ++-- SpiceQL/src/query.cpp | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml index 8073185..442ee69 100644 --- a/.github/workflows/ci_testing.yml +++ b/.github/workflows/ci_testing.yml @@ -148,7 +148,7 @@ jobs: run: | mkdir -p build cd build - cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -G Ninja -DSPICEQL_BUILD_TESTS=OFF -DSPICEQL_BUILD_DOCS=OFF .. + cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DCMAKE_CXX_STANDARD=20 -G Ninja -DSPICEQL_BUILD_TESTS=OFF -DSPICEQL_BUILD_DOCS=OFF .. cmake --build . --target install --config Release ls ${{ github.workspace }}\build\Release - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 diff --git a/SpiceQL/include/memo.h b/SpiceQL/include/memo.h index 0fe5435..53c91ac 100644 --- a/SpiceQL/include/memo.h +++ b/SpiceQL/include/memo.h @@ -101,11 +101,11 @@ namespace Memo { if (CACHE_DIRECTORY == "") { const char* cache_dir_char = getenv("SPICEQL_CACHE_DIR"); - std::string cache_dir; + std::string cache_dir; if (cache_dir_char == NULL) { std::string tempname = "spiceql-cache-" + gen_random(10); - cache_dir = fs::temp_directory_path() / tempname / "spiceql_cache"; + cache_dir = (fs::temp_directory_path() / tempname / "spiceql_cache").to_string(); } else { cache_dir = cache_dir_char; diff --git a/SpiceQL/src/query.cpp b/SpiceQL/src/query.cpp index 01c06f6..e959095 100644 --- a/SpiceQL/src/query.cpp +++ b/SpiceQL/src/query.cpp @@ -85,21 +85,21 @@ namespace SpiceQL { } vector> files = {}; - string extension = static_cast(kernels.at(0)).extension(); + string extension = static_cast(kernels.at(0)).extension().string(); transform(extension.begin(), extension.end(), extension.begin(), ::tolower); // ensure everything is different versions of the same file for(const fs::path &k : kernels) { - string currentKernelExt = k.extension(); + string currentKernelExt = k.extension().string(); transform(currentKernelExt.begin(), currentKernelExt.end(), currentKernelExt.begin(), ::tolower); if (currentKernelExt != extension) { - throw invalid_argument("The input extensions (" + (string)k.filename() + ") are not different versions of the same file " + kernels.at(0)); + throw invalid_argument("The input extensions (" + k.filename().string() + ") are not different versions of the same file " + kernels.at(0)); } bool foundList = false; for (int i = 0; i < files.size(); i++) { const fs::path &firstVecElem = files[i][0]; - string fileName = firstVecElem.filename(); - string kernelName = k.filename(); + string fileName = firstVecElem.filename().string(); + string kernelName = k.filename().string(); SPDLOG_TRACE("filename: {}", fileName); SPDLOG_TRACE("kernel name: {}", kernelName); @@ -116,12 +116,12 @@ namespace SpiceQL { SPDLOG_TRACE("Truncated kernel name: {}", kernelName); if (fileName == kernelName) { - files[i].push_back(k); + files[i].push_back(k.string()); foundList = true; } } if (!foundList) { - files.push_back({k}); + files.push_back({k.string()}); } foundList = false; } From 1d74c21e34f4f34f3c595bf8b432f71d9067f93a Mon Sep 17 00:00:00 2001 From: acpaquette Date: Fri, 18 Jul 2025 16:04:40 -0700 Subject: [PATCH 12/14] Fixed to_string to string --- SpiceQL/include/memo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpiceQL/include/memo.h b/SpiceQL/include/memo.h index 53c91ac..e3d9b49 100644 --- a/SpiceQL/include/memo.h +++ b/SpiceQL/include/memo.h @@ -105,7 +105,7 @@ namespace Memo { if (cache_dir_char == NULL) { std::string tempname = "spiceql-cache-" + gen_random(10); - cache_dir = (fs::temp_directory_path() / tempname / "spiceql_cache").to_string(); + cache_dir = (fs::temp_directory_path() / tempname / "spiceql_cache").string(); } else { cache_dir = cache_dir_char; From bb199b79e49ac78cf97db42af813145395a28741 Mon Sep 17 00:00:00 2001 From: acpaquette Date: Fri, 18 Jul 2025 16:18:43 -0700 Subject: [PATCH 13/14] More windows string fixes and try visual studio build agent again --- .github/workflows/ci_testing.yml | 4 ++-- SpiceQL/src/config.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml index 442ee69..76cee4d 100644 --- a/.github/workflows/ci_testing.yml +++ b/.github/workflows/ci_testing.yml @@ -148,8 +148,8 @@ jobs: run: | mkdir -p build cd build - cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DCMAKE_CXX_STANDARD=20 -G Ninja -DSPICEQL_BUILD_TESTS=OFF -DSPICEQL_BUILD_DOCS=OFF .. - cmake --build . --target install --config Release + cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DCMAKE_CXX_STANDARD=20 -G "Visual Studio 17 2022" -DSPICEQL_BUILD_TESTS=OFF -DSPICEQL_BUILD_DOCS=OFF .. + cmake --build . --target ALL_BUILD --config Release ls ${{ github.workspace }}\build\Release - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 with: diff --git a/SpiceQL/src/config.cpp b/SpiceQL/src/config.cpp index d9aeda3..46755d1 100644 --- a/SpiceQL/src/config.cpp +++ b/SpiceQL/src/config.cpp @@ -140,7 +140,7 @@ namespace SpiceQL { fs::path fsDataPath(dataPath); json::json_pointer kernelPath(getParentPointer(full_pointer.to_string(), 1)); - if (fs::exists((string)fsDataPath + kernelPath.to_string())) { + if (fs::exists(fsDataPath.string() + kernelPath.to_string())) { fsDataPath += kernelPath.to_string(); kernelPath = json::json_pointer("/kernels"); string kernelType = json::json_pointer(getParentPointer(full_pointer.to_string(), 2)).back(); @@ -150,7 +150,7 @@ namespace SpiceQL { } } - vector> res = getPathsFromRegex(fsDataPath, jsonArrayToVector(eval_json[json_pointer])); + vector> res = getPathsFromRegex(fsDataPath.string(), jsonArrayToVector(eval_json[json_pointer])); eval_json[json_pointer] = res; } copyConfig[pointer] = eval_json; From 511938a87f4d4c4c3c8cfaa17a12258b08268fdb Mon Sep 17 00:00:00 2001 From: acpaquette Date: Fri, 18 Jul 2025 16:44:24 -0700 Subject: [PATCH 14/14] Switch back to ninja for slightly better build error messages --- .github/workflows/ci_testing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_testing.yml b/.github/workflows/ci_testing.yml index 76cee4d..442ee69 100644 --- a/.github/workflows/ci_testing.yml +++ b/.github/workflows/ci_testing.yml @@ -148,8 +148,8 @@ jobs: run: | mkdir -p build cd build - cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DCMAKE_CXX_STANDARD=20 -G "Visual Studio 17 2022" -DSPICEQL_BUILD_TESTS=OFF -DSPICEQL_BUILD_DOCS=OFF .. - cmake --build . --target ALL_BUILD --config Release + cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DCMAKE_CXX_STANDARD=20 -G Ninja -DSPICEQL_BUILD_TESTS=OFF -DSPICEQL_BUILD_DOCS=OFF .. + cmake --build . --target install --config Release ls ${{ github.workspace }}\build\Release - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 with: