more improvements to ci

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
This commit is contained in:
Yuhang Zhao 2022-10-13 19:48:52 +08:00
parent dacc1e8bf3
commit 6fa183c586
2 changed files with 20 additions and 7 deletions

View File

@ -63,5 +63,5 @@ jobs:
run: | run: |
mkdir ci-test-build mkdir ci-test-build
cd ci-test-build cd ci-test-build
cmake -DCMAKE_C_COMPILER=${{ matrix.CC }} -DCMAKE_CXX_COMPILER=${{ matrix.CXX }} -DFRAMELESSHELPER_EXAMPLES_DEPLOYQT=OFF ${{ matrix.additional_cmake_flags }} .. cmake -DCMAKE_C_COMPILER=${{ matrix.CC }} -DCMAKE_CXX_COMPILER=${{ matrix.CXX }} -DCMAKE_BUILD_TYPE=Release -DFRAMELESSHELPER_EXAMPLES_DEPLOYQT=OFF ${{ matrix.additional_cmake_flags }} ..
cmake --build . cmake --build .

View File

@ -127,14 +127,27 @@ if(FRAMELESSHELPER_BUILD_EXAMPLES)
add_subdirectory(examples) add_subdirectory(examples)
endif() endif()
message("#######################################")
message("CMAKE_HOST_SYSTEM: ${CMAKE_HOST_SYSTEM}") message("CMAKE_HOST_SYSTEM: ${CMAKE_HOST_SYSTEM}")
message("CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}")
message("CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}") message("CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}")
message("CMAKE_LINKER: ${CMAKE_LINKER}") message("CMAKE_LINKER: ${CMAKE_LINKER}")
message("CMAKE_MAKE_PROGRAM: ${CMAKE_MAKE_PROGRAM}") message("CMAKE_MAKE_PROGRAM: ${CMAKE_MAKE_PROGRAM}")
message("CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") message("CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
message("#######################################")
message("FRAMELESSHELPER_BUILD_STATIC: ${FRAMELESSHELPER_BUILD_STATIC}") if(DEFINED Qt6_DIR)
message("FRAMELESSHELPER_BUILD_WIDGETS: ${FRAMELESSHELPER_BUILD_WIDGETS}") message("Qt installation dir: ${Qt6_DIR}")
message("FRAMELESSHELPER_BUILD_QUICK: ${FRAMELESSHELPER_BUILD_QUICK}") else()
message("FRAMELESSHELPER_BUILD_EXAMPLES: ${FRAMELESSHELPER_BUILD_EXAMPLES}") message("Qt installation dir: ${Qt5_DIR}")
message("FRAMELESSHELPER_EXAMPLES_DEPLOYQT: ${FRAMELESSHELPER_EXAMPLES_DEPLOYQT}") endif()
message("Qt version: ${QT_VERSION}")
# TODO: output shared/static Qt.
message("#######################################")
message("FramelessHelper version: ${PROJECT_VERSION}")
message("FramelessHelper commit hash: ${PROJECT_VERSION_COMMIT}")
message("Build the static version of FramelessHelper: ${FRAMELESSHELPER_BUILD_STATIC}")
message("Build the FramelessHelper::Widgets module: ${FRAMELESSHELPER_BUILD_WIDGETS}")
message("Build the FramelessHelper::Quick module: ${FRAMELESSHELPER_BUILD_QUICK}")
message("Build the FramelessHelper demo applications: ${FRAMELESSHELPER_BUILD_EXAMPLES}")
message("Deploy Qt libraries after compilation: ${FRAMELESSHELPER_EXAMPLES_DEPLOYQT}")
message("#######################################")