Add guard to not add_subdirectory when the target exists

JDAI-CV · May 24, 2019 · 52ad7de · 52ad7de
1 parent 52da80a
commit 52ad7de
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 18 deletions.
diff --git a/cmake/glog.cmake b/cmake/glog.cmake
@@ -1,4 +1,7 @@
-macro(configure_glog)
+function(configure_glog)
+    if (TARGET glog::glog)
+        return()
+    endif()
     message(STATUS "Configureing glog...")
 
     set(TEMP_BUILD_TESTING ${BUILD_TESTING})
@@ -10,4 +13,4 @@ macro(configure_glog)
 
     set(BUILD_TESTING ${TEMP_BUILD_TESTING} CACHE BOOL "" FORCE)
     set(WITH_GFLAGS ${TEMP_WITH_GFLAGS} CACHE BOOL "" FORCE)
-endmacro()
+endfunction()
diff --git a/cmake/onnx.cmake b/cmake/onnx.cmake
@@ -1,4 +1,8 @@
-macro(configure_onnx)
+function(configure_onnx)
+    if (TARGET onnx)
+        return()
+    endif()
+
     if (NOT ${DNN_SYSTEM_PROTOBUF})
         include(${PROJECT_SOURCE_DIR}/cmake/protobuf.cmake)
         configure_protobuf()
@@ -30,4 +34,4 @@ macro(configure_onnx)
     # target_compile_definitions(onnx
     # PUBLIC
     # -DONNX_NAMESPACE=${DAQ_ONNX_NAMESPACE})
-endmacro()
+endfunction()
diff --git a/cmake/protobuf.cmake b/cmake/protobuf.cmake
@@ -1,16 +1,17 @@
-macro(configure_protobuf)
-    message(STATUS "Configuring protobuf...")
-    option(protobuf_BUILD_TESTS "" OFF)
-    option(protobuf_BUILD_EXAMPLES "" OFF)
-    if (${CMAKE_SYSTEM_NAME} STREQUAL "Android")
-        option(protobuf_BUILD_PROTOC_BINARIES "" OFF)
-    else()
-        option(protobuf_BUILD_PROTOC_BINARIES "" ON)
+function(configure_protobuf)
+    if (NOT TARGET libprotobuf-lite)
+        message(STATUS "Configuring protobuf...")
+        option(protobuf_BUILD_TESTS "" OFF)
+        option(protobuf_BUILD_EXAMPLES "" OFF)
+        if (${CMAKE_SYSTEM_NAME} STREQUAL "Android")
+            option(protobuf_BUILD_PROTOC_BINARIES "" OFF)
+        else()
+            option(protobuf_BUILD_PROTOC_BINARIES "" ON)
+        endif()
+        add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/protobuf/cmake)
+        if (protobuf_BUILD_PROTOC_BINARIES)
+            add_executable(protobuf::protoc ALIAS protoc)
+        endif()
     endif()
-    add_subdirectory(${PROJECT_SOURCE_DIR}/third_party/protobuf/cmake)
-    if (protobuf_BUILD_PROTOC_BINARIES)
-        add_executable(protobuf::protoc ALIAS protoc)
-    endif()
-    add_library(protobuf::libprotobuf ALIAS libprotobuf)
     add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)
-endmacro()
+endfunction()