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

Remove the cmake configuration machinery for config.hpp #606

Merged
merged 1 commit into from
Apr 16, 2024
Merged

Remove the cmake configuration machinery for config.hpp #606

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
22 changes: 0 additions & 22 deletions cmake/unifex_flags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,6 @@ include(CMakePushCheckState)
include(CheckIncludeFile)
include(CheckSymbolExists)

# Probe for coroutine TS support
find_package(Coroutines COMPONENTS Experimental Final)
# MSVC's coroutines support is too broken to support here, sadly.
if(CXX_COROUTINES_HAVE_COROUTINES AND NOT UNIFEX_CXX_COMPILER_MSVC)
set(UNIFEX_NO_COROUTINES FALSE)
set(UNIFEX_COROUTINES_HEADER ${CXX_COROUTINES_HEADER})
set(UNIFEX_COROUTINES_NAMESPACE ${CXX_COROUTINES_NAMESPACE})
else()
set(UNIFEX_NO_COROUTINES TRUE)
endif()

# Probe for memory_resource support
find_package(MemoryResource COMPONENTS Experimental Final)
# Set some variables to be used by configure_file.
if(CXX_MEMORY_RESOURCE_HAVE_PMR)
set(UNIFEX_NO_MEMORY_RESOURCE FALSE)
set(UNIFEX_MEMORY_RESOURCE_HEADER ${CXX_MEMORY_RESOURCE_HEADER})
set(UNIFEX_MEMORY_RESOURCE_NAMESPACE ${CXX_MEMORY_RESOURCE_NAMESPACE})
else()
set(UNIFEX_NO_MEMORY_RESOURCE TRUE)
endif()

if(DEFINED UNIFEX_NO_LIBURING)
message(WARNING "[unifex warning]: forcing no_liburing=${UNIFEX_NO_LIBURING} !")
elseif(DEFINED ENV{UNIFEX_NO_LIBURING})
Expand Down
4 changes: 0 additions & 4 deletions examples/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ foreach(file-path ${example-sources})
add_test(NAME "example-${file-name}" COMMAND ${file-name})
endforeach()

if(CXX_MEMORY_RESOURCE_HAVE_PMR)
target_link_libraries(any_unique PUBLIC std::memory_resource)
endif()

if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
file(GLOB linux-example-sources "linux/*.cpp")
foreach(file-path ${linux-example-sources})
Expand Down
23 changes: 13 additions & 10 deletions include/unifex/config.hpp.in → include/unifex/config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@

#include <cassert>

// the configured options and settings for unifex
#define UNIFEX_VERSION_MAJOR @libunifex_VERSION_MAJOR@
#define UNIFEX_VERSION_MINOR @libunifex_VERSION_MINOR@

#cmakedefine01 UNIFEX_NO_MEMORY_RESOURCE
#cmakedefine UNIFEX_MEMORY_RESOURCE_HEADER <@UNIFEX_MEMORY_RESOURCE_HEADER@>
#cmakedefine UNIFEX_MEMORY_RESOURCE_NAMESPACE @UNIFEX_MEMORY_RESOURCE_NAMESPACE@
#if __has_include(<memory_resource>)
# define UNIFEX_NO_MEMORY_RESOURCE 0
# define UNIFEX_MEMORY_RESOURCE_HEADER <memory_resource>
# define UNIFEX_MEMORY_RESOURCE_NAMESPACE std::pmr
#else
# define UNIFEX_NO_MEMORY_RESOURCE 1
#endif

#if !defined(__has_cpp_attribute)
#define UNIFEX_NO_UNIQUE_ADDRESS
Expand Down Expand Up @@ -60,8 +60,7 @@
# if __has_include(<coroutine>) && defined(__cpp_lib_coroutine)
# define UNIFEX_COROUTINES_HEADER <coroutine>
# define UNIFEX_COROUTINES_NAMESPACE std
# elif __has_include(<experimental/coroutine>) && \
!(defined(_MSC_VER) && defined(__clang__)) // clang-cl.exe
# elif __has_include(<experimental/coroutine>)
# define UNIFEX_COROUTINES_HEADER <experimental/coroutine>
# define UNIFEX_COROUTINES_NAMESPACE std::experimental
# else
Expand All @@ -80,7 +79,11 @@
#endif

#if !defined(UNIFEX_NO_EPOLL)
#cmakedefine01 UNIFEX_NO_EPOLL
# if __has_include(<sys/epoll.h>)
# define UNIFEX_NO_EPOLL 0
# else
# define UNIFEX_NO_EPOLL 1
# endif
#endif

#if !defined(UNIFEX_NO_LIBURING)
Expand Down
6 changes: 0 additions & 6 deletions source/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")

endif()

configure_file(
../include/unifex/config.hpp.in
"${PROJECT_BINARY_DIR}/include/unifex/config.hpp")

include(GNUInstallDirs)
target_include_directories(unifex
PUBLIC
Expand All @@ -87,8 +83,6 @@ configure_file(unifex.pc.in unifex.pc @ONLY)
# install unifex with its configure file into the default paths

install(TARGETS unifex EXPORT unifexTargets)
install(FILES ${PROJECT_BINARY_DIR}/include/unifex/config.hpp
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/unifex/)
install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/
TYPE INCLUDE
PATTERN "*.in" EXCLUDE)
Expand Down
4 changes: 0 additions & 4 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ foreach(file-path ${test-sources})
add_test(NAME "test-${file-name}" COMMAND ${file-name})
endforeach()

if(CXX_MEMORY_RESOURCE_HAVE_PMR)
target_link_libraries(any_unique_test PUBLIC std::memory_resource)
endif()

target_link_libraries(any_sender_of_test PUBLIC GTest::gmock_main)
target_link_libraries(async_manual_reset_event_test PUBLIC GTest::gmock_main)
target_link_libraries(async_scope_test PUBLIC GTest::gmock_main)
Expand Down
Loading