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

Clean CMake #19

Closed
wants to merge 3 commits into from
Closed

Clean CMake #19

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e636d90
cmake: remove param in endfunction()
clementperon Jun 23, 2024
a418c2d
cmake: introduce copy_to_cpp() function
clementperon Jul 14, 2024
11b4527
cmake: mark CMake 3.28.3 as compatible
clementperon Jul 14, 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
33 changes: 15 additions & 18 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 2.8.12...3.28.3)

# nsync provides portable synchronization primitives, such as mutexes and
# condition variables.
Expand Down Expand Up @@ -29,7 +29,7 @@ function (set_c_target tgtname files)
"${PROJECT_SOURCE_DIR}/platform/linux"
)
endif ()
endfunction (set_c_target)
endfunction ()

function (set_cpp_target tgtname files)
target_include_directories ("${tgtname}" BEFORE PRIVATE
Expand All @@ -49,7 +49,16 @@ function (set_cpp_target tgtname files)
PROPERTIES LANGUAGE CXX
COMPILE_FLAGS "${NSYNC_CPP_FLAGS}")
endforeach (s)
endfunction (set_cpp_target)
endfunction ()

function (copy_to_cpp file)
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/cpp/${file}"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${file}"
"${CMAKE_CURRENT_BINARY_DIR}/cpp/${file}"
DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${file}"
)
endfunction ()

# -----------------------------------------------------------------
# Platform dependencies
Expand Down Expand Up @@ -271,11 +280,7 @@ foreach (s IN ITEMS ${NSYNC_COMMON_SRC} ${NSYNC_OS_CPP_SRC})
# the filetype based on the extension so we need to override LANGUAGE
# manually. A custom command first copies the source files (only if
# changed) so the LANGUAGE property does not conflict.
add_custom_command (
OUTPUT cpp/${s}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/${s} cpp/${s}
DEPENDS ${PROJECT_SOURCE_DIR}/${s}
)
copy_to_cpp("${s}")

set (NSYNC_CPP_SRC_COPY ${NSYNC_CPP_SRC_COPY}
cpp/${s}
Expand Down Expand Up @@ -311,11 +316,7 @@ if (NSYNC_ENABLE_TESTS)
)

foreach (t IN ITEMS ${NSYNC_TEST_SRC})
add_custom_command (
OUTPUT cpp/${t}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/${t} cpp/${t}
DEPENDS ${PROJECT_SOURCE_DIR}/${t}
)
copy_to_cpp("${t}")

set (NSYNC_TEST_CPP_SRC "${NSYNC_TEST_CPP_SRC}"
"cpp/${t}"
Expand Down Expand Up @@ -365,11 +366,7 @@ if (NSYNC_ENABLE_TESTS)
add_test (NAME ${t} COMMAND ${t})
add_dependencies (test_c ${t})

add_custom_command (
OUTPUT cpp/testing/${t}.c
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/testing/${t}.c cpp/testing/${t}.c
DEPENDS ${PROJECT_SOURCE_DIR}/testing/${t}.c
)
copy_to_cpp("testing/${t}.c")

set (NSYNC_TEST_CPP_SRC ${NSYNC_TEST_CPP_SRC}
cpp/testing/${t}.c
Expand Down