CD::Qt works
This commit is contained in:
@@ -40,11 +40,11 @@ set(__deps_core "PIP")
|
|||||||
if (BUILDING_cd)
|
if (BUILDING_cd)
|
||||||
|
|
||||||
if (NOT SET_TARGETS_cd)
|
if (NOT SET_TARGETS_cd)
|
||||||
message("create aliases")
|
#message("create aliases")
|
||||||
foreach (_l ${__libs})
|
foreach (_l ${__libs})
|
||||||
set(_m ${__module_${_l}})
|
set(_m ${__module_${_l}})
|
||||||
if((NOT TARGET CD::${_m}) AND TARGET cd_${_l})
|
if((NOT TARGET CD::${_m}) AND TARGET cd_${_l})
|
||||||
message("alias CD::${_m} = cd_${_l}")
|
#message("alias CD::${_m} = cd_${_l}")
|
||||||
add_library(CD::${_m} ALIAS cd_${_l})
|
add_library(CD::${_m} ALIAS cd_${_l})
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
@@ -52,7 +52,7 @@ if (BUILDING_cd)
|
|||||||
|
|
||||||
else()
|
else()
|
||||||
|
|
||||||
message("create interfaces")
|
#message("create interfaces")
|
||||||
foreach (_l ${__libs})
|
foreach (_l ${__libs})
|
||||||
set(_m ${__module_${_l}})
|
set(_m ${__module_${_l}})
|
||||||
find_library(CD_LIBRARY_${_l} cd_${_l} HINTS ${_SEARCH_DIR})
|
find_library(CD_LIBRARY_${_l} cd_${_l} HINTS ${_SEARCH_DIR})
|
||||||
@@ -62,7 +62,7 @@ else()
|
|||||||
IMPORTED_LOCATION "${CD_LIBRARY_${_l}}"
|
IMPORTED_LOCATION "${CD_LIBRARY_${_l}}"
|
||||||
INTERFACE_INCLUDE_DIRECTORIES "${cd_INCLUDES};${__inc_${_l}}"
|
INTERFACE_INCLUDE_DIRECTORIES "${cd_INCLUDES};${__inc_${_l}}"
|
||||||
INTERFACE_LINK_LIBRARIES "${__deps_${_l}};${__libs_${_l}}")
|
INTERFACE_LINK_LIBRARIES "${__deps_${_l}};${__libs_${_l}}")
|
||||||
message("imported CD::${_m} = ${CD_LIBRARY_${_l}} ${__deps_${_l}} ${__libs_${_l}} ${__inc_${_l}}")
|
#message("imported CD::${_m} = ${CD_LIBRARY_${_l}} ${__deps_${_l}} ${__libs_${_l}} ${__inc_${_l}}")
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
@@ -82,12 +82,12 @@ if (QAD_FOUND OR BUILDING_qad)
|
|||||||
|
|
||||||
if (NOT SET_TARGETS_cd)
|
if (NOT SET_TARGETS_cd)
|
||||||
set(SET_TARGETS_cd ON CACHE BOOL "")
|
set(SET_TARGETS_cd ON CACHE BOOL "")
|
||||||
message("create aliases")
|
#message("create aliases")
|
||||||
foreach(_l ${__libs})
|
foreach(_l ${__libs})
|
||||||
foreach(_v ${_QT_VERSIONS_})
|
foreach(_v ${_QT_VERSIONS_})
|
||||||
set(_m ${__module_${_l}})
|
set(_m ${__module_${_l}})
|
||||||
if((NOT TARGET CD::${_m}${_v}) AND TARGET cd_${_l}${_v})
|
if((NOT TARGET CD::${_m}${_v}) AND TARGET cd_${_l}${_v})
|
||||||
message("alias CD::${_m}${_v} = cd_${_l}${_v}")
|
#message("alias CD::${_m}${_v} = cd_${_l}${_v}")
|
||||||
set(MULTILIB_CD__${_m}_SUFFIX_Qt${_v} ${_v} CACHE STRING "")
|
set(MULTILIB_CD__${_m}_SUFFIX_Qt${_v} ${_v} CACHE STRING "")
|
||||||
add_library(CD::${_m}${_v} ALIAS cd_${_l}${_v})
|
add_library(CD::${_m}${_v} ALIAS cd_${_l}${_v})
|
||||||
endif()
|
endif()
|
||||||
@@ -98,19 +98,19 @@ if (QAD_FOUND OR BUILDING_qad)
|
|||||||
|
|
||||||
else()
|
else()
|
||||||
|
|
||||||
message("create interfaces")
|
#message("create interfaces")
|
||||||
foreach(_l ${__libs})
|
foreach(_l ${__libs})
|
||||||
foreach(_v ${_QT_VERSIONS_})
|
foreach(_v ${_QT_VERSIONS_})
|
||||||
set(_m ${__module_${_l}})
|
set(_m ${__module_${_l}})
|
||||||
find_library(CD_LIBRARY_${_l}${_v} cd_${_l}${_v} HINTS ${cd_LIBDIR})
|
find_library(CD_LIBRARY_${_l}${_v} cd_${_l}${_v} HINTS ${cd_LIBDIR})
|
||||||
#message("found ${_l}${_v} = ${CD_LIBRARY_${_l}${_v}}")
|
#message("found ${_l}${_v} = ${CD_LIBRARY_${_l}${_v}}")
|
||||||
if((NOT TARGET CD::${_m}${_v}) AND CD_LIBRARY_${_l}${_v})
|
if((NOT TARGET CD::${_m}${_v}) AND CD_LIBRARY_${_l}${_v})
|
||||||
message("imported CD::${_m}${_v} = ${CD_LIBRARY_${_l}${_v}}")
|
#message("imported CD::${_m}${_v} = ${CD_LIBRARY_${_l}${_v}}")
|
||||||
set(MULTILIB_CD__${_m}_SUFFIX_Qt${_v} ${_v} CACHE STRING "")
|
set(MULTILIB_CD__${_m}_SUFFIX_Qt${_v} ${_v} CACHE STRING "")
|
||||||
add_library(CD::${_m}${_v} UNKNOWN IMPORTED)
|
add_library(CD::${_m}${_v} UNKNOWN IMPORTED)
|
||||||
set(_deps)
|
set(_deps)
|
||||||
foreach (_d ${__deps_${_l}})
|
foreach (_d ${__deps_${_l}})
|
||||||
if (${_d} MATCHES "CD::*")
|
if (${_d} MATCHES "QAD::*")
|
||||||
list(APPEND _deps ${_d}${_v})
|
list(APPEND _deps ${_d}${_v})
|
||||||
else()
|
else()
|
||||||
list(APPEND _deps ${_d})
|
list(APPEND _deps ${_d})
|
||||||
|
|||||||
Reference in New Issue
Block a user