FindQAD fix
This commit is contained in:
@@ -25,24 +25,13 @@ if(NOT BUILDING_qad)
|
||||
endif()
|
||||
|
||||
shstk_is_parent_exists(hasParent PARENT_DIRECTORY)
|
||||
set(_SEARCH_DIR)
|
||||
if(WIN32)
|
||||
find_package(MinGW REQUIRED)
|
||||
endif()
|
||||
|
||||
shstk_set_find_dirs(qad)
|
||||
set(_SEARCH_DIR ${qad_LIBDIR})
|
||||
|
||||
if (NOT BUILDING_qad)
|
||||
|
||||
find_file(QAD_H_INCLUDE "qad_types.h" HINTS ${PIP_DIR}/include/qad ${qad_INCDIR} $ENV{SMSDK_DIR}/include/qad)
|
||||
#if (DEFINED ANDROID_PLATFORM)
|
||||
# set(QAD_INCLUDES ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include/qad)
|
||||
#else()
|
||||
get_filename_component(QAD_INCLUDES ${QAD_H_INCLUDE} PATH)
|
||||
#endif()
|
||||
set(_SEARCH_DIR ${qad_LIBDIR} $ENV{SMSDK_DIR}/lib)
|
||||
shstk_find_header(QAD "qad_version.h" "")
|
||||
|
||||
list(APPEND _SEARCH_DIR $ENV{SMSDK_DIR}/lib)
|
||||
shstk_find_header(qad QAD "qad_version.h" "")
|
||||
endif()
|
||||
|
||||
if(QAD_FIND_VERSION VERSION_GREATER QAD_VERSION)
|
||||
@@ -89,10 +78,9 @@ if (BUILDING_qad)
|
||||
foreach(_l ${__libs})
|
||||
foreach(_v ${_QT_VERSIONS_})
|
||||
set(_m ${__module_${_l}})
|
||||
string(REPLACE ":" "_" _m_str "${_m}")
|
||||
if((NOT TARGET QAD::${_m}${_v}) AND TARGET qad_${_l}${_v})
|
||||
#message("alias QAD::${_m}${_v} = qad_${_l}${_v}")
|
||||
set(MULTILIB_qad_${_l}_SUFFIX_Qt${_v} ${_v} CACHE STRING "")
|
||||
set(MULTILIB_QAD__${_m}_SUFFIX_Qt${_v} ${_v} CACHE STRING "")
|
||||
add_library(QAD::${_m}${_v} ALIAS qad_${_l}${_v})
|
||||
endif()
|
||||
endforeach()
|
||||
@@ -108,12 +96,11 @@ else()
|
||||
foreach(_l ${__libs})
|
||||
foreach(_v ${_QT_VERSIONS_})
|
||||
set(_m ${__module_${_l}})
|
||||
string(REPLACE ":" "_" _m_str "${_m}")
|
||||
find_library(QAD_LIBRARY_${_l}${_v} qad_${_l}${_v} HINTS ${qad_LIBDIR})
|
||||
find_library(QAD_LIBRARY_${_l}${_v} qad_${_l}${_v} HINTS ${_SEARCH_DIR})
|
||||
#message("found ${_l}${_v} = ${QAD_LIBRARY_${_l}${_v}}")
|
||||
if((NOT TARGET QAD::${_m}${_v}) AND QAD_LIBRARY_${_l}${_v})
|
||||
#message("imported QAD::${_m}${_v} = ${QAD_LIBRARY_${_l}${_v}}")
|
||||
set(MULTILIB_qad_${_l}_SUFFIX_Qt${_v} ${_v} CACHE STRING "")
|
||||
set(MULTILIB_QAD__${_m}_SUFFIX_Qt${_v} ${_v} CACHE STRING "")
|
||||
add_library(QAD::${_m}${_v} UNKNOWN IMPORTED)
|
||||
set(_deps)
|
||||
foreach (_d ${__deps_${_l}})
|
||||
@@ -125,7 +112,7 @@ else()
|
||||
endforeach()
|
||||
set_target_properties(QAD::${_m}${_v} PROPERTIES
|
||||
IMPORTED_LOCATION "${QAD_LIBRARY_${_l}${_v}}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${QAD_INCLUDES}"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${qad_INCLUDES}"
|
||||
INTERFACE_LINK_LIBRARIES "${_deps}")
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
Reference in New Issue
Block a user