Fix cmake package

Author: nmellado

CMakeLists.txt

@@ -321,3 +321,8 @@ install(
     FILES "${project_config}" "${version_config}"
     DESTINATION "${config_install_dir}"
 )
+
+install(
+    FILES "${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindSDPA.cmake"
+    DESTINATION "${config_install_dir}"
+)

cmake/Config.cmake.in

@@ -23,14 +23,11 @@ if(@OpenGR_USE_CHEALPIX@)
   include("@OpenGR_EXPORT_TARGET_DIR@/chealpixTargets.cmake")
 endif(@OpenGR_USE_CHEALPIX@)
 
-if(@OpenGR_USE_SDPA@)
-  find_dependency(SDPA REQUIRED)
-endif(@OpenGR_USE_SDPA@)
-
-if(@OpenGR_USE_MOSEK@)
-  find_dependency(MOSEK REQUIRED)
-endif(@OpenGR_USE_MOSEK@)
+find_package(SDPA QUIET)
+set(OpenGR_USE_SDPA ${SDPA_FOUND})
 
+find_package(MOSEK QUIET)
+set(OpenGR_USE_MOSEK ${MOSEK_FOUND})
 
 include("@OpenGR_EXPORT_TARGET_DIR@/OpenGR-AccelLibTargets.cmake")
 include("@OpenGR_EXPORT_TARGET_DIR@/OpenGR-AlgoLibTargets.cmake")
@@ -46,7 +43,4 @@ if(@OpenGR_USE_CHEALPIX@)
   set(OpenGR_LIBRARIES chealpix)
 endif(@OpenGR_USE_CHEALPIX@)
 
-set(OpenGR_USE_SDPA  @OpenGR_USE_SDPA@)
-set(OpenGR_USE_MOSEK @OpenGR_USE_MOSEK@)
-
 set(OpenGR_FOUND 1)

src/gr/accelerators/CMakeLists.txt

@@ -14,19 +14,9 @@ set(accel_relative_INCLUDE
     ${accel_ROOT}/normalset.hpp
     ${accel_ROOT}/normalset.hpp
     ${accel_ROOT}/utils.h
-    ${accel_ROOT}/gret_sdp/wrappers.h)
-
-if(OpenGR_USE_SDPA)
-    set (accel_relative_INCLUDE
-        ${accel_relative_INCLUDE}
-        ${accel_ROOT}/gret_sdp/SDPAWrapper.h)
-endif(OpenGR_USE_SDPA)
-
-if(OpenGR_USE_MOSEK)
-    set (accel_relative_INCLUDE
-        ${accel_relative_INCLUDE}
-        ${accel_ROOT}/gret_sdp/MOSEKWrapper.h)
-endif(OpenGR_USE_MOSEK)
+    ${accel_ROOT}/gret_sdp/wrappers.h
+    ${accel_ROOT}/gret_sdp/SDPAWrapper.h
+    ${accel_ROOT}/gret_sdp/MOSEKWrapper.h)
 
 if(OpenGR_USE_CHEALPIX)
     include_directories(${Chealpix_INCLUDE_DIR})
@@ -50,19 +40,6 @@ add_dependencies(accel gr::utils)
 set_target_properties(accel PROPERTIES
   INTERFACE_COMPILE_FEATURES cxx_std_17
 )
-if(OpenGR_USE_SDPA)
-    add_dependencies(accel SDPA)
-    target_link_libraries(accel INTERFACE ${SDPA_LIBRARIES})
-    target_include_directories(accel INTERFACE ${SDPA_INCLUDE_DIRS})
-    target_compile_definitions(accel INTERFACE OpenGR_USE_SDPA)
-endif(OpenGR_USE_SDPA)
-
-if(OpenGR_USE_MOSEK)
-    add_dependencies(accel MOSEK)
-    target_link_libraries(accel INTERFACE ${MOSEK_LIBRARIES})
-    target_include_directories(accel INTERFACE ${MOSEK_INCLUDE_DIRS})
-    target_compile_definitions(accel INTERFACE OpenGR_USE_MOSEK)
-endif(OpenGR_USE_MOSEK)
 
 if(OpenGR_USE_CHEALPIX)
     add_dependencies(accel chealpix)

tests/CMakeLists.txt

@@ -85,6 +85,20 @@ if (Boost_FOUND)
         COMMAND gret-sdp gret-sdp-data/config.json)
     target_link_libraries(gret-sdp ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} gr::accel gr::algo gr::utils)
     add_dependencies(gret-sdp copy_gret_sdp_data)
+
+    if(OpenGR_USE_SDPA)
+        find_package( SDPA )
+        target_link_libraries(gret-sdp ${SDPA_LIBRARIES})
+        target_include_directories(gret-sdp PRIVATE ${SDPA_INCLUDE_DIRS})
+        target_compile_definitions(gret-sdp PRIVATE OpenGR_USE_SDPA)
+    endif(OpenGR_USE_SDPA)
+
+    if(OpenGR_USE_MOSEK)
+        find_package( MOSEK )
+        target_link_libraries(gret-sdp ${MOSEK_LIBRARIES})
+        target_include_directories(gret-sdp PRIVATE ${MOSEK_INCLUDE_DIRS})
+        target_compile_definitions(gret-sdp PRIVATE OpenGR_USE_MOSEK)
+    endif(OpenGR_USE_MOSEK)
 endif (Boost_FOUND)
 
 #############################################