cmake: bump deps

cmake: move re2 since it is a deps of protobuf

Author: Mizux

CMakeLists.txt

@@ -83,7 +83,7 @@ option(BUILD_ZLIB "Build the ZLIB dependency Library" ON)
 message(STATUS "Build ZLIB: ${BUILD_ZLIB}")
 
 option(BUILD_absl "Build the abseil-cpp dependency Library" ON)
-message(STATUS "Build abseil-cpp: ${BUILD_absl}")
+message(STATUS "Build absl: ${BUILD_absl}")
 
 option(BUILD_re2 "Build the RE2 dependency Library" ON)
 message(STATUS "Build re2: ${BUILD_re2}")
@@ -101,6 +101,9 @@ endif()
 message(STATUS "Build googletest: ${BUILD_googletest}")
 message(STATUS "Build benchmark: ${BUILD_benchmark}")
 
+option(BUILD_EXAMPLES "Build examples" ON)
+message(STATUS "Build examples: ${BUILD_EXAMPLES}")
+
 # Find system deps
 include(system_deps)
 
@@ -113,7 +116,9 @@ include(check_deps)
 
 include(cpp)
 
-## Examples
-option(BUILD_EXAMPLES "Build examples" ON)
-message(STATUS "Build examples: ${BUILD_EXAMPLES}")
+add_subdirectory(Foo)
+add_subdirectory(Bar)
+add_subdirectory(FooBar)
+add_subdirectory(FooBarApp)
+
 add_subdirectory(examples)

cmake/check_deps.cmake

@@ -52,6 +52,9 @@ endif()
 
 # CXX Test
 if(BUILD_TESTING)
+  if(NOT TARGET GTest::gtest)
+    message(FATAL_ERROR "Target GTest::gtest not available.")
+  endif()
   if(NOT TARGET GTest::gtest_main)
     message(FATAL_ERROR "Target GTest::gtest_main not available.")
   endif()

cmake/cpp.cmake

@@ -61,7 +61,7 @@ macro(get_cpp_proto PROTO_HDRS PROTO_SRCS)
       COMMAND ${PROTOC_PRG}
         "--proto_path=${PROJECT_SOURCE_DIR}"
         ${PROTO_DIRS}
-        "--cpp_out=${PROJECT_BINARY_DIR}"
+        "--cpp_out=dllexport_decl=PROTO_DLL:${PROJECT_BINARY_DIR}"
         ${PROTO_FILE}
       DEPENDS ${PROTO_NAME}.proto ${PROTOC_PRG}
       COMMENT "Generate C++ protocol buffer for ${PROTO_FILE}"
@@ -72,14 +72,9 @@ macro(get_cpp_proto PROTO_HDRS PROTO_SRCS)
   endforeach()
 endmacro()
 
-
-add_subdirectory(Foo)
-add_subdirectory(Bar)
-add_subdirectory(FooBar)
-
-add_subdirectory(FooBarApp)
-
-# Install
+###################
+## CMake Install ##
+###################
 install(EXPORT ${PROJECT_NAME}Targets
   NAMESPACE ${PROJECT_NAMESPACE}::
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}

cmake/dependencies/CMakeLists.txt

@@ -121,8 +121,8 @@ if(BUILD_googletest)
     "${CMAKE_CURRENT_LIST_DIR}/../../patches/googletest-v1.17.0.patch"
   )
   set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-  set(INSTALL_GTEST OFF)
   set(GTEST_HAS_ABSL ON)
+  set(INSTALL_GTEST OFF)
   FetchContent_MakeAvailable(googletest)
   list(POP_BACK CMAKE_MESSAGE_INDENT)
   message(CHECK_PASS "fetched")