Skip to content

fix: update cpm to 0.42.0 + add option guards for the tests #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: update cpm to 0.42.0 + add option guards for the tests #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
101e01d
fix: update cpm to 0.42.0
aminya Jun 17, 2025
2c44051
build: export compile-commands + build in parallel
aminya Jun 17, 2025
7e9d050
fix: add option guards for the tests
aminya Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,3 +272,5 @@ analysis-cppcheck-build-dir
ideas

desktop.iniimages/

.cache/
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ project(

# ---- Options ----
option(GLOB_USE_GHC_FILESYSTEM "Use ghc::filesystem instead of std::filesystem" OFF)
option(BUILD_TESTING "Build tests" OFF)

# ---- Include guards ----

Expand All @@ -32,6 +33,7 @@ CPMAddPackage(
VERSION 1.3
)

if(BUILD_TESTING)
CPMAddPackage(
NAME googletest
GITHUB_REPOSITORY google/googletest
Expand All @@ -41,6 +43,7 @@ CPMAddPackage(
)
# For Windows: Prevent overriding the parent project's compiler/linker settings
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
endif()

# ---- Add source files ----

Expand Down Expand Up @@ -93,6 +96,7 @@ packageProject(
)

# --- setup tests ---
if(BUILD_TESTING)
enable_testing()

add_executable(glob_tests test/rglob_test.cpp)
Expand All @@ -106,3 +110,4 @@ target_compile_definitions(glob_tests_single PRIVATE USE_SINGLE_HEADER=1)
target_link_libraries(glob_tests_single PRIVATE gtest_main)
target_include_directories(glob_tests_single PRIVATE single_include)
add_test(NAME glob_tests_single COMMAND glob_tests_single)
endif()
4 changes: 2 additions & 2 deletions build_and_run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
cmake -Hall -Bbuild
cmake --build build
cmake -Hall -Bbuild -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
cmake --build build --parallel
./build/standalone/glob --help
2 changes: 1 addition & 1 deletion cmake/CPM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(CPM_DOWNLOAD_VERSION 0.35.1)
set(CPM_DOWNLOAD_VERSION 0.42.0)

if(CPM_SOURCE_CACHE)
set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
Expand Down