Enable static targets

jupyter-xeus · Jun 17, 2024 · 2fea312 · 2fea312
1 parent cd77902
commit 2fea312
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -503,8 +503,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}Config.cmake
               ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
               DESTINATION ${XVEGA_CMAKECONFIG_INSTALL_DIR})
 
-if (XVEGA_BUILD_SHARED)
-    install(EXPORT ${PROJECT_NAME}-targets
-            FILE ${PROJECT_NAME}Targets.cmake
-            DESTINATION ${XVEGA_CMAKECONFIG_INSTALL_DIR})
-endif ()
+install(EXPORT ${PROJECT_NAME}-targets
+        FILE ${PROJECT_NAME}Targets.cmake
+        DESTINATION ${XVEGA_CMAKECONFIG_INSTALL_DIR})
diff --git a/xvegaConfig.cmake.in b/xvegaConfig.cmake.in
@@ -19,11 +19,19 @@ find_dependency(xproperty @xproperty_REQUIRED_VERSION@)
 
 if(NOT TARGET @PROJECT_NAME@)
     include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
-    get_target_property(@PROJECT_NAME@_INCLUDE_DIR @PROJECT_NAME@ INTERFACE_INCLUDE_DIRECTORIES)
 
-    if (TARGET xvega-static)
+    if (TARGET xvega AND xvega-static)
+        get_target_property(@PROJECT_NAME@_INCLUDE_DIR xvega INTERFACE_INCLUDE_DIRECTORIES)
+        get_target_property(@PROJECT_NAME@_LIBRARY xvega LOCATION)
+        get_target_property(@PROJECT_NAME@_STATIC_LIBRARY xvega-static LOCATION)
+    elseif (TARGET xvega)
+        get_target_property(@PROJECT_NAME@_INCLUDE_DIR xvega INTERFACE_INCLUDE_DIRECTORIES)
+        get_target_property(@PROJECT_NAME@_LIBRARY xvega LOCATION)
+    elseif (TARGET xvega-static)
+        get_target_property(@PROJECT_NAME@_INCLUDE_DIR xvega-static INTERFACE_INCLUDE_DIRECTORIES)
         get_target_property(@PROJECT_NAME@_STATIC_LIBRARY xvega-static LOCATION)
     endif ()
+
 endif()
 
 set(@PROJECT_NAME@_LIBRARY "")