try to fix ci
Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
parent
5ec3eaf88e
commit
c29e6de2e1
|
@ -140,13 +140,17 @@ message("C++ compiler: ${CMAKE_CXX_COMPILER}")
|
|||
message("Linker: ${CMAKE_LINKER}")
|
||||
message("Make program: ${CMAKE_MAKE_PROGRAM}")
|
||||
message("Build type: ${CMAKE_BUILD_TYPE}")
|
||||
message("Install prefix: ${CMAKE_INSTALL_PREFIX}")
|
||||
message("#######################################")
|
||||
set(__qt_inst_dir UNKNOWN)
|
||||
set(__qt_inst_dir)
|
||||
if(DEFINED Qt6_DIR)
|
||||
set(__qt_inst_dir "${Qt6_DIR}")
|
||||
else()
|
||||
set(__qt_inst_dir "${Qt5_DIR}")
|
||||
endif()
|
||||
# /whatever/Qt/6.4.0/gcc_64/lib/cmake/Qt6
|
||||
set(__qt_inst_dir ${__qt_inst_dir}/../../..)
|
||||
cmake_path(NORMAL_PATH __qt_inst_dir __qt_inst_dir)
|
||||
message("Qt install dir: ${__qt_inst_dir}")
|
||||
message("Qt version: ${QT_VERSION}")
|
||||
# TODO: output shared/static Qt.
|
||||
|
|
|
@ -127,6 +127,13 @@ if(${QT_VERSION} VERSION_GREATER_EQUAL 6.2)
|
|||
set(__lib_suffix ${CMAKE_DEBUG_POSTFIX})
|
||||
endif()
|
||||
set(__lib_ext)
|
||||
if(FRAMELESSHELPER_BUILD_STATIC)
|
||||
if(WIN32)
|
||||
set(__lib_ext lib)
|
||||
else()
|
||||
set(__lib_ext a)
|
||||
endif()
|
||||
else()
|
||||
if(WIN32)
|
||||
set(__lib_ext dll)
|
||||
elseif(APPLE)
|
||||
|
@ -134,6 +141,7 @@ if(${QT_VERSION} VERSION_GREATER_EQUAL 6.2)
|
|||
elseif(UNIX)
|
||||
set(__lib_ext so)
|
||||
endif()
|
||||
endif()
|
||||
install(FILES
|
||||
"${__import_dir}/qmldir"
|
||||
"${__import_dir}/${SUB_PROJ_NAME}.qmltypes"
|
||||
|
|
Loading…
Reference in New Issue