diff --git a/.ci/compile.sh b/.ci/compile.sh index 70e177b55..f30072de2 100755 --- a/.ci/compile.sh +++ b/.ci/compile.sh @@ -169,7 +169,8 @@ if [[ $MAKE_PACKAGE ]]; then echo "killing XProtectBehaviorService"; sudo pkill -9 XProtect >/dev/null || true; echo "waiting for XProtectBehaviorService kill"; while pgrep "XProtect"; do sleep 3; done; fi - cmake --build . --target package --config "$BUILDTYPE" + + cmake --build . --log-level=VERBOSE --target package --config "$BUILDTYPE" echo "::endgroup::" if [[ $PACKAGE_SUFFIX ]]; then diff --git a/CMakeLists.txt b/CMakeLists.txt index 29ee84798..cfc04677b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,8 @@ option(WITH_DBCONVERTER "build dbconverter" ON) # Compile tests option(TEST "build tests" OFF) +set(CPACK_VERBOSE TRUE) + # Default to "Release" build type # User-provided value for CMAKE_BUILD_TYPE must be checked before the PROJECT() call if(DEFINED CMAKE_BUILD_TYPE) @@ -87,6 +89,7 @@ set(CMAKE_CXX_STANDARD CACHE STRING "C++ ISO Standard" ) set(CMAKE_CXX_STANDARD_REQUIRED True) +set(CMAKE_CXX_EXTENSIONS OFF) # Set conventional loops set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) @@ -135,7 +138,7 @@ if(UNIX) endif() endif() elseif(WIN32) - set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/rundir/${CMAKE_BUILD_TYPE}) + set(CMAKE_INSTALL_PREFIX ${PROJECT_BINARY_DIR}/rundir/${CMAKE_BUILD_TYPE}) endif() # Define proper compilation flags