Skip to content

Commit

Permalink
Cleaned CMake remove unneeded CXX_EXTENSIONS flags and a debug message (
Browse files Browse the repository at this point in the history
  • Loading branch information
techbech authored Oct 9, 2023
1 parent 3fcc66a commit 1c1fcc5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
8 changes: 3 additions & 5 deletions CMakeLists.txt
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
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

0 comments on commit 1c1fcc5

Please sign in to comment.