github_mirror
/
framelesshelper
mirror of https://github.com/wangwenx190/framelesshelper.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

try to fix ci 

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2022-10-18 10:52:04 +08:00
parent 5ec3eaf88e
commit c29e6de2e1
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -140,13 +140,17 @@ message("C++ compiler: ${CMAKE_CXX_COMPILER}")
message("Linker: ${CMAKE_LINKER}") message("Linker: ${CMAKE_LINKER}")
message("Make program: ${CMAKE_MAKE_PROGRAM}") message("Make program: ${CMAKE_MAKE_PROGRAM}")
message("Build type: ${CMAKE_BUILD_TYPE}") message("Build type: ${CMAKE_BUILD_TYPE}")
message("Install prefix: ${CMAKE_INSTALL_PREFIX}")
message("#######################################") message("#######################################")
set(__qt_inst_dir UNKNOWN) set(__qt_inst_dir)
if(DEFINED Qt6_DIR) if(DEFINED Qt6_DIR)
set(__qt_inst_dir "${Qt6_DIR}") set(__qt_inst_dir "${Qt6_DIR}")
else() else()
set(__qt_inst_dir "${Qt5_DIR}") set(__qt_inst_dir "${Qt5_DIR}")
endif() 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 install dir: ${__qt_inst_dir}")
message("Qt version: ${QT_VERSION}") message("Qt version: ${QT_VERSION}")
# TODO: output shared/static Qt. # TODO: output shared/static Qt.

8
src/quick/CMakeLists.txt
View File

@ -127,6 +127,13 @@ if(${QT_VERSION} VERSION_GREATER_EQUAL 6.2)
set(__lib_suffix ${CMAKE_DEBUG_POSTFIX}) set(__lib_suffix ${CMAKE_DEBUG_POSTFIX})
endif() endif()
set(__lib_ext) set(__lib_ext)
if(FRAMELESSHELPER_BUILD_STATIC)
if(WIN32)
set(__lib_ext lib)
else()
set(__lib_ext a)
endif()
else()
if(WIN32) if(WIN32)
set(__lib_ext dll) set(__lib_ext dll)
elseif(APPLE) elseif(APPLE)
@ -134,6 +141,7 @@ if(${QT_VERSION} VERSION_GREATER_EQUAL 6.2)
elseif(UNIX) elseif(UNIX)
set(__lib_ext so) set(__lib_ext so)
endif() endif()
endif()
install(FILES install(FILES
"${__import_dir}/qmldir" "${__import_dir}/qmldir"
"${__import_dir}/${SUB_PROJ_NAME}.qmltypes" "${__import_dir}/${SUB_PROJ_NAME}.qmltypes"