diff --git a/cmake/Modules/FindGNSSTK.cmake b/cmake/Modules/FindGNSSTK.cmake index 3826f30a0..e810ebee7 100644 --- a/cmake/Modules/FindGNSSTK.cmake +++ b/cmake/Modules/FindGNSSTK.cmake @@ -127,6 +127,7 @@ if(GNSSTK_FOUND AND NOT ENABLE_OWN_GNSSTK AND NOT TARGET Gnsstk::gnsstk) IMPORTED_LOCATION "${GNSSTK_LIBRARY}" INTERFACE_INCLUDE_DIRECTORIES "${GNSSTK_INCLUDE_DIR};${GNSSTK_INCLUDE_DIR}/gpstk" INTERFACE_LINK_LIBRARIES "${GNSSTK_LIBRARY}" + IMPORTED_IMPLIB "${GNSSTK_LIBRARY}" ) else() set_target_properties(Gnsstk::gnsstk PROPERTIES @@ -134,6 +135,7 @@ if(GNSSTK_FOUND AND NOT ENABLE_OWN_GNSSTK AND NOT TARGET Gnsstk::gnsstk) IMPORTED_LOCATION "${GNSSTK_LIBRARY}" INTERFACE_INCLUDE_DIRECTORIES "${GNSSTK_INCLUDE_DIR};${GNSSTK_INCLUDE_DIR}/gnsstk" INTERFACE_LINK_LIBRARIES "${GNSSTK_LIBRARY}" + IMPORTED_IMPLIB "${GNSSTK_LIBRARY}" ) endif() endif() diff --git a/cmake/Modules/FindMATIO.cmake b/cmake/Modules/FindMATIO.cmake index 712995d7b..49e0bf8cd 100644 --- a/cmake/Modules/FindMATIO.cmake +++ b/cmake/Modules/FindMATIO.cmake @@ -75,12 +75,13 @@ find_path(MATIO_INCLUDE_DIR /usr/include /usr/local/include /opt/local/include + ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include DOC "The MATIO include directory" ) # Look for the library. find_library(MATIO_LIBRARY - NAMES matio + NAMES matio libmatio PATHS ${MATIO_ROOT_USER_DEFINED}/lib ${MATIO_ROOT_USER_DEFINED}/lib64 @@ -110,6 +111,7 @@ find_library(MATIO_LIBRARY /usr/local/lib /usr/local/lib64 /opt/local/lib + ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib DOC "The MATIO library" ) @@ -182,5 +184,6 @@ if(MATIO_FOUND AND NOT TARGET Matio::matio) IMPORTED_LOCATION "${MATIO_LIBRARY}" INTERFACE_INCLUDE_DIRECTORIES "${MATIO_INCLUDE_DIR}" INTERFACE_LINK_LIBRARIES "${MATIO_LIBRARY}" + IMPORTED_IMPLIB "${MATIO_LIBRARY}" ) endif()