Merge pull request #962 from Halmoni100/external-absl-2

Additional external absl fixes
google · Jan 18, 2024 · 7b9ee4c · 7b9ee4c
2 parents 4ce471c + 0ea22c0
commit 7b9ee4c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -163,16 +163,20 @@ elseif (SPM_ABSL_PROVIDER STREQUAL "module")
         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/abseil-cpp
         GIT_PROGRESS TRUE)
   add_subdirectory(third_party/abseil-cpp)
-  file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/third_party/absl ${CMAKE_CURRENT_SOURCE_DIR}/third_party/absl.org)
-  execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
-    ${CMAKE_CURRENT_SOURCE_DIR}/third_party/abseil-cpp/absl
-    ${CMAKE_CURRENT_SOURCE_DIR}/third_party/absl)
+  if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/absl.org)
+    file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/third_party/absl ${CMAKE_CURRENT_SOURCE_DIR}/third_party/absl.org)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
+      ${CMAKE_CURRENT_SOURCE_DIR}/third_party/abseil-cpp/absl
+      ${CMAKE_CURRENT_SOURCE_DIR}/third_party/absl)
+  endif()
 elseif (SPM_ABSL_PROVIDER STREQUAL "package")
   find_package(absl REQUIRED)
   get_target_property(ABSL_INCLUDE_DIRS absl::base INTERFACE_INCLUDE_DIRECTORIES)
-  file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/third_party/absl ${CMAKE_CURRENT_SOURCE_DIR}/third_party/absl.org)
-  execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
-      ${ABSL_INCLUDE_DIRS}/absl ${CMAKE_CURRENT_SOURCE_DIR}/third_party/absl)
+  if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/absl.org)
+    file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/third_party/absl ${CMAKE_CURRENT_SOURCE_DIR}/third_party/absl.org)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
+        ${ABSL_INCLUDE_DIRS}/absl ${CMAKE_CURRENT_SOURCE_DIR}/third_party/absl)
+  endif()
   include_directories(${ABSL_INCLUDE_DIRS})
 endif()
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -18,6 +18,8 @@ if (SPM_ABSL_PROVIDER STREQUAL "module" OR SPM_ABSL_PROVIDER STREQUAL "package")
   list(APPEND SPM_LIBS absl::strings)
   list(APPEND SPM_LIBS absl::flags)
   list(APPEND SPM_LIBS absl::flags_parse)
+  list(APPEND SPM_LIBS absl::log)
+  list(APPEND SPM_LIBS absl::check)
   if (MSVC)
    add_definitions("/D_USE_EXTERNAL_ABSL")
   else()