Build as shared library or static library

google · May 5, 2023 · 099774c · 099774c
1 parent 9f856ab
commit 099774c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1022,15 +1022,6 @@ else()
     add_library(draco::draco ALIAS draco)
 
   else()
-    draco_add_library(
-      NAME draco_static
-      OUTPUT_NAME draco
-      TYPE STATIC
-      DEFINES ${draco_defines}
-      INCLUDES ${draco_include_paths}
-      OBJLIB_DEPS ${draco_object_library_deps}
-      LIB_DEPS ${draco_lib_deps})
-
     if(BUILD_SHARED_LIBS)
       draco_add_library(
         NAME draco_shared
@@ -1039,10 +1030,19 @@ else()
         TYPE SHARED
         DEFINES ${draco_defines}
         INCLUDES ${draco_include_paths}
-        LIB_DEPS draco_static)
+        OBJLIB_DEPS ${draco_object_library_deps}
+        LIB_DEPS ${draco_lib_deps})
       add_library(draco::draco ALIAS draco_shared)
       set_target_properties(draco_shared PROPERTIES EXPORT_NAME draco)
     else()
+      draco_add_library(
+        NAME draco_static
+        OUTPUT_NAME draco
+        TYPE STATIC
+        DEFINES ${draco_defines}
+        INCLUDES ${draco_include_paths}
+        OBJLIB_DEPS ${draco_object_library_deps}
+        LIB_DEPS ${draco_lib_deps})
       add_library(draco::draco ALIAS draco_static)
       set_target_properties(draco_static PROPERTIES EXPORT_NAME draco)
     endif()

diff --git a/cmake/draco_install.cmake b/cmake/draco_install.cmake
@@ -65,18 +65,18 @@ macro(draco_setup_install_target)
       ARCHIVE DESTINATION "${libs_path}"
       LIBRARY DESTINATION "${libs_path}")
   else()
-    install(
-      TARGETS draco_static
-      EXPORT dracoExport
-      DESTINATION "${libs_path}")
-
     if(BUILD_SHARED_LIBS)
       install(
         TARGETS draco_shared
         EXPORT dracoExport
         RUNTIME DESTINATION "${bin_path}"
         ARCHIVE DESTINATION "${libs_path}"
         LIBRARY DESTINATION "${libs_path}")
+    else()
+      install(
+        TARGETS draco_static
+        EXPORT dracoExport
+        DESTINATION "${libs_path}")
     endif()
   endif()