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

Cleaned CMake remove unneeded CXX_EXTENSIONS flags and a debug message #6

Merged
merged 1 commit into from
Oct 9, 2023
Merged

Cleaned CMake remove unneeded CXX_EXTENSIONS flags and a debug message #6

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
8 changes: 3 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@ list(FILTER sw_protobuf_abseil_sources EXCLUDE REGEX .*absl\/.*\/.*_test.*)
list(FILTER sw_protobuf_abseil_sources EXCLUDE REGEX .*absl\/.*\/.*mock_.*)
list(FILTER sw_protobuf_abseil_sources EXCLUDE REGEX .*absl\/.*\/.*_mock_.*)

message(STATUS "Abseil sources: ${sw_protobuf_abseil_sources}")

add_library(sw_protobuf_abseil STATIC ${sw_protobuf_abseil_sources})
target_compile_features(sw_protobuf_abseil PUBLIC cxx_std_14)
target_compile_features(sw_protobuf_abseil PUBLIC cxx_std_17)
target_include_directories(sw_protobuf_abseil PUBLIC ${STEINWURF_RESOLVE}/protobuf-source/third_party/abseil-cpp)

if (APPLE)
Expand All @@ -45,7 +43,7 @@ file(GLOB_RECURSE sw_protobuf_utf8_range_sources
list(FILTER sw_protobuf_utf8_range_sources EXCLUDE REGEX .*test\.cc)

add_library(sw_protobuf_utf8_range STATIC ${sw_protobuf_utf8_range_sources})
target_compile_features(sw_protobuf_utf8_range PUBLIC cxx_std_14)
target_compile_features(sw_protobuf_utf8_range PUBLIC cxx_std_17)
target_link_libraries(sw_protobuf_utf8_range PRIVATE sw_protobuf_abseil)
target_include_directories(sw_protobuf_utf8_range PUBLIC ${STEINWURF_RESOLVE}/protobuf-source/third_party/utf8_range)

Expand All @@ -58,7 +56,7 @@ list(FILTER sw_protobuf_sources EXCLUDE REGEX .*src/google/protobuf\/compiler\/.
list(FILTER sw_protobuf_sources EXCLUDE REGEX .*src/google/protobuf\/.*test.*)

add_library(sw_protobuf STATIC ${sw_protobuf_sources})
target_compile_features(sw_protobuf PUBLIC cxx_std_14)
target_compile_features(sw_protobuf PUBLIC cxx_std_17)
target_link_libraries(sw_protobuf PUBLIC sw_protobuf_abseil sw_protobuf_utf8_range)
target_include_directories(sw_protobuf PUBLIC ${STEINWURF_RESOLVE}/protobuf-source/src)

Expand Down
2 changes: 1 addition & 1 deletion NEWS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ every change, see the Git log.

Latest
------
* tbd
* Path: Cleaned CMake remove unneeded CXX_EXTENSIONS flags and a debug message.

2.0.4
-----
Expand Down
Loading