SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

FindQAD fix

Browse Source
This commit is contained in:
Пелипенко Иван
2020-09-05 01:23:05 +03:00
parent c576a14deb
commit 32707fbd4d
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cmake/FindQAD.cmake
View File

@@ -25,24 +25,13 @@ if(NOT BUILDING_qad)
endif() endif()
shstk_is_parent_exists(hasParent PARENT_DIRECTORY) shstk_is_parent_exists(hasParent PARENT_DIRECTORY)
set(_SEARCH_DIR)
if(WIN32)
find_package(MinGW REQUIRED)
endif()
shstk_set_find_dirs(qad) shstk_set_find_dirs(qad)
set(_SEARCH_DIR ${qad_LIBDIR})
if (NOT BUILDING_qad) if (NOT BUILDING_qad)
list(APPEND _SEARCH_DIR $ENV{SMSDK_DIR}/lib)
find_file(QAD_H_INCLUDE "qad_types.h" HINTS ${PIP_DIR}/include/qad ${qad_INCDIR} $ENV{SMSDK_DIR}/include/qad) shstk_find_header(qad QAD "qad_version.h" "")
#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" "")
endif() endif()
if(QAD_FIND_VERSION VERSION_GREATER QAD_VERSION) if(QAD_FIND_VERSION VERSION_GREATER QAD_VERSION)
@@ -89,10 +78,9 @@ if (BUILDING_qad)
foreach(_l ${__libs}) foreach(_l ${__libs})
foreach(_v ${_QT_VERSIONS_}) foreach(_v ${_QT_VERSIONS_})
set(_m ${__module_${_l}}) set(_m ${__module_${_l}})
string(REPLACE ":" "_" _m_str "${_m}")
if((NOT TARGET QAD::${_m}${_v}) AND TARGET qad_${_l}${_v}) if((NOT TARGET QAD::${_m}${_v}) AND TARGET qad_${_l}${_v})
#message("alias QAD::${_m}${_v} = 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}) add_library(QAD::${_m}${_v} ALIAS qad_${_l}${_v})
endif() endif()
endforeach() endforeach()
@@ -108,12 +96,11 @@ else()
foreach(_l ${__libs}) foreach(_l ${__libs})
foreach(_v ${_QT_VERSIONS_}) foreach(_v ${_QT_VERSIONS_})
set(_m ${__module_${_l}}) set(_m ${__module_${_l}})
string(REPLACE ":" "_" _m_str "${_m}") find_library(QAD_LIBRARY_${_l}${_v} qad_${_l}${_v} HINTS ${_SEARCH_DIR})
find_library(QAD_LIBRARY_${_l}${_v} qad_${_l}${_v} HINTS ${qad_LIBDIR})
#message("found ${_l}${_v} = ${QAD_LIBRARY_${_l}${_v}}") #message("found ${_l}${_v} = ${QAD_LIBRARY_${_l}${_v}}")
if((NOT TARGET QAD::${_m}${_v}) AND QAD_LIBRARY_${_l}${_v}) if((NOT TARGET QAD::${_m}${_v}) AND QAD_LIBRARY_${_l}${_v})
#message("imported QAD::${_m}${_v} = ${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) add_library(QAD::${_m}${_v} UNKNOWN IMPORTED)
set(_deps) set(_deps)
foreach (_d ${__deps_${_l}}) foreach (_d ${__deps_${_l}})
@@ -125,7 +112,7 @@ else()
endforeach() endforeach()
set_target_properties(QAD::${_m}${_v} PROPERTIES set_target_properties(QAD::${_m}${_v} PROPERTIES
IMPORTED_LOCATION "${QAD_LIBRARY_${_l}${_v}}" IMPORTED_LOCATION "${QAD_LIBRARY_${_l}${_v}}"
INTERFACE_INCLUDE_DIRECTORIES "${QAD_INCLUDES}" INTERFACE_INCLUDE_DIRECTORIES "${qad_INCLUDES}"
INTERFACE_LINK_LIBRARIES "${_deps}") INTERFACE_LINK_LIBRARIES "${_deps}")
endif() endif()
endforeach() endforeach()