Skip to content
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

Jump to bottom

Some small fixes #842

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

Some small fixes #842

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
5951dab
CMake: Replace deprecated exec_program() with execute_process()
rootkea Feb 21, 2024
a287da0
Specify required cmake version in top-level CMakeLists.txt only
rootkea Feb 21, 2024
2bec3e9
cmake: handle version range while locating nanopb
rootkea Feb 21, 2024
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: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ endif()
set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
"${CMAKE_SOURCE_DIR}/src/proto/nanopb/extra")

find_package(Nanopb 0.4.5...<1.0.0 REQUIRED)
find_package(SDL2 REQUIRED)
message("SDL2 include dir: ${SDL2_INCLUDE_DIRS}")
Expand Down
7 changes: 3 additions & 4 deletions src/cdogs/enet/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required(VERSION 3.1)
cmake_policy(SET CMP0054 NEW)

project(enet)
Expand All @@ -24,7 +23,7 @@ if(MSVC)
else()
add_definitions(-Wno-error)
endif()

if(HAS_FCNTL)
add_definitions(-DHAS_FCNTL=1)
endif()
Expand Down Expand Up @@ -55,9 +54,9 @@ endif()
if(HAS_SOCKLEN_T)
add_definitions(-DHAS_SOCKLEN_T=1)
endif()

include_directories(${PROJECT_SOURCE_DIR}/include)

add_library(enet STATIC
callbacks.c
compress.c
Expand Down
2 changes: 1 addition & 1 deletion src/cdogs/yajl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ configure_file(yajl.pc.cmake ${shareDir}/yajl.pc)
foreach (header ${PUB_HDRS})
set (header ${CMAKE_CURRENT_SOURCE_DIR}/${header})

exec_program(${CMAKE_COMMAND} ARGS -E copy_if_different ${header} ${incDir})
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir})

add_custom_command(TARGET yajl_s POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir})
Expand Down
2 changes: 0 additions & 2 deletions src/proto/nanopb/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 2.8.12)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should update nanopb from upstream instead

project(nanopb C)

set(nanopb_VERSION_STRING nanopb-0.4.4)
Expand Down
1 change: 0 additions & 1 deletion src/proto/nanopb/conan-wrapper/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required(VERSION 2.8.12)
project(cmake_wrapper)

include(${CMAKE_CURRENT_BINARY_DIR}/conanbuildinfo.cmake)
Expand Down
8 changes: 3 additions & 5 deletions src/proto/nanopb/extra/FindNanopb.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,9 +362,7 @@ find_path(NANOPB_GENERATOR_SOURCE_DIR
mark_as_advanced(NANOPB_GENERATOR_SOURCE_DIR)

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Nanopb DEFAULT_MSG
NANOPB_INCLUDE_DIRS
NANOPB_SRCS NANOPB_HDRS
NANOPB_GENERATOR_SOURCE_DIR
PROTOBUF_PROTOC_EXECUTABLE
find_package_handle_standard_args(Nanopb
REQUIRED_VARS NANOPB_INCLUDE_DIRS NANOPB_SRCS NANOPB_HDRS NANOPB_GENERATOR_SOURCE_DIR PROTOBUF_PROTOC_EXECUTABLE
HANDLE_VERSION_RANGE
)
1 change: 0 additions & 1 deletion src/tests/cbehave/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
cmake_minimum_required(VERSION 3.0)
project(cbehave C)

include_directories(.)
Expand Down
Loading