Make CMake modules work for Windows

This commit is contained in:
Carles Fernandez 2022-10-25 14:53:37 +02:00
parent de165e2a51
commit f2c56a1766
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 6 additions and 1 deletions

View File

@ -127,6 +127,7 @@ if(GNSSTK_FOUND AND NOT ENABLE_OWN_GNSSTK AND NOT TARGET Gnsstk::gnsstk)
IMPORTED_LOCATION "${GNSSTK_LIBRARY}" IMPORTED_LOCATION "${GNSSTK_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${GNSSTK_INCLUDE_DIR};${GNSSTK_INCLUDE_DIR}/gpstk" INTERFACE_INCLUDE_DIRECTORIES "${GNSSTK_INCLUDE_DIR};${GNSSTK_INCLUDE_DIR}/gpstk"
INTERFACE_LINK_LIBRARIES "${GNSSTK_LIBRARY}" INTERFACE_LINK_LIBRARIES "${GNSSTK_LIBRARY}"
IMPORTED_IMPLIB "${GNSSTK_LIBRARY}"
) )
else() else()
set_target_properties(Gnsstk::gnsstk PROPERTIES 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}" IMPORTED_LOCATION "${GNSSTK_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${GNSSTK_INCLUDE_DIR};${GNSSTK_INCLUDE_DIR}/gnsstk" INTERFACE_INCLUDE_DIRECTORIES "${GNSSTK_INCLUDE_DIR};${GNSSTK_INCLUDE_DIR}/gnsstk"
INTERFACE_LINK_LIBRARIES "${GNSSTK_LIBRARY}" INTERFACE_LINK_LIBRARIES "${GNSSTK_LIBRARY}"
IMPORTED_IMPLIB "${GNSSTK_LIBRARY}"
) )
endif() endif()
endif() endif()

View File

@ -75,12 +75,13 @@ find_path(MATIO_INCLUDE_DIR
/usr/include /usr/include
/usr/local/include /usr/local/include
/opt/local/include /opt/local/include
${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include
DOC "The MATIO include directory" DOC "The MATIO include directory"
) )
# Look for the library. # Look for the library.
find_library(MATIO_LIBRARY find_library(MATIO_LIBRARY
NAMES matio NAMES matio libmatio
PATHS PATHS
${MATIO_ROOT_USER_DEFINED}/lib ${MATIO_ROOT_USER_DEFINED}/lib
${MATIO_ROOT_USER_DEFINED}/lib64 ${MATIO_ROOT_USER_DEFINED}/lib64
@ -110,6 +111,7 @@ find_library(MATIO_LIBRARY
/usr/local/lib /usr/local/lib
/usr/local/lib64 /usr/local/lib64
/opt/local/lib /opt/local/lib
${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib
DOC "The MATIO library" DOC "The MATIO library"
) )
@ -182,5 +184,6 @@ if(MATIO_FOUND AND NOT TARGET Matio::matio)
IMPORTED_LOCATION "${MATIO_LIBRARY}" IMPORTED_LOCATION "${MATIO_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${MATIO_INCLUDE_DIR}" INTERFACE_INCLUDE_DIRECTORIES "${MATIO_INCLUDE_DIR}"
INTERFACE_LINK_LIBRARIES "${MATIO_LIBRARY}" INTERFACE_LINK_LIBRARIES "${MATIO_LIBRARY}"
IMPORTED_IMPLIB "${MATIO_LIBRARY}"
) )
endif() endif()