Skip to content

build: update CMake versions and language standards #29

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

Merged
DavidLeeds merged 1 commit into from
May 13, 2025
Merged

build: update CMake versions and language standards #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
cmake_minimum_required(VERSION 3.5)
project(hashmap VERSION 2.0.0 LANGUAGES C)
cmake_minimum_required(VERSION 3.16)
project(hashmap VERSION 2.1.0 LANGUAGES C)

set(CMAKE_C_STANDARD 11)
if(NOT DEFINED CMAKE_C_STANDARD)
set(CMAKE_C_STANDARD 23)
set(CMAKE_C_EXTENSIONS OFF)
endif()

##############################################
# Build options
Expand Down Expand Up @@ -36,7 +39,7 @@ target_include_directories(hashmap
${CMAKE_CURRENT_SOURCE_DIR}/src
)
target_compile_options(hashmap
PRIVATE $<$<C_COMPILER_ID:GNU>:-Wall -Werror>
PRIVATE -Wall -Werror
)

##############################################
Expand Down
2 changes: 0 additions & 2 deletions examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
cmake_minimum_required(VERSION 3.5)

# Hashmap example
add_executable(hashmap_example hashmap_example.c)
target_compile_options(hashmap_example PRIVATE -Wall -Werror)
Expand Down
6 changes: 3 additions & 3 deletions examples/hashmap_example.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ struct blob *blob_load(void)
if ((b = malloc(sizeof(*b))) == NULL) {
return NULL;
}
snprintf(b->key, sizeof(b->key), "%02lx", random() % 100);
b->data_len = random() % 10;
memset(b->data, random(), b->data_len);
snprintf(b->key, sizeof(b->key), "%02x", rand() % 100);
b->data_len = rand() % 10;
memset(b->data, rand(), b->data_len);

return b;
}
Expand Down
10 changes: 8 additions & 2 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
cmake_minimum_required(VERSION 3.19)
project(hashmap_test)

set(CMAKE_C_STANDARD 11)
set(CMAKE_CXX_STANDARD 20)
if(NOT DEFINED CMAKE_C_STANDARD)
set(CMAKE_C_STANDARD 23)
set(CMAKE_C_EXTENSIONS OFF)
endif()

if(NOT DEFINED CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 20)
endif()

include(FetchContent)

Expand Down