ci: build relwithdebinfo instead of debug

Probably more appropriate for end-user use.
This commit is contained in:
itsmattkc
2020-08-08 02:27:46 +10:00
parent 0cd4edad57
commit 99d94a0d82
3 changed files with 8 additions and 21 deletions
+3 -3
View File
@@ -11,8 +11,8 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary
REM Install 64-bit packages
set VCPKG_DEFAULT_TRIPLET=x64-windows
REM Hack to only install debug builds for time
echo set(VCPKG_BUILD_TYPE debug) >> C:\Tools\vcpkg\triplets\x64-windows.cmake
REM Hack to only install release builds for time
echo set(VCPKG_BUILD_TYPE release) >> C:\Tools\vcpkg\triplets\x64-windows.cmake
REM Install Open*IO libraries
vcpkg install opencolorio
@@ -34,7 +34,7 @@ REM Add Qt and FFmpeg directory to path
set PATH=%PATH%;C:\Qt\5.13.2\msvc2017_64\bin;%APPVEYOR_BUILD_FOLDER%\%FFMPEG_VER%-dev
REM Run cmake
cmake -G "Ninja" . -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=Debug
cmake -G "Ninja" . -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo
REM Build with Ninja
ninja.exe || exit /B 1
+2 -2
View File
@@ -6,7 +6,7 @@ export VERSION=$(git rev-parse --short=8 HEAD)
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
# Generate Makefile
cmake . -DCMAKE_BUILD_TYPE=Debug
cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
# Make
make -j$(sysctl -n hw.ncpu)
@@ -50,7 +50,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
# Generate Makefile
cmake . -DCMAKE_BUILD_TYPE=Debug
cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo
# Make
make -j$(nproc)
+3 -16
View File
@@ -84,11 +84,6 @@ target_compile_definitions(${OLIVE_TARGET} PRIVATE ${OLIVE_DEFINITIONS})
# Set compiler options
if(MSVC)
STRING (REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
STRING (REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
STRING (REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
STRING (REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
target_compile_options(
${OLIVE_TARGET}
PRIVATE
@@ -98,14 +93,14 @@ if(MSVC)
/experimental:external
/external:anglebrackets
/external:W0
/O2
"$<$<CONFIG:RELEASE>:/O2>"
"$<$<COMPILE_LANGUAGE:CXX>:/MP>"
)
else()
target_compile_options(
${OLIVE_TARGET}
PRIVATE
-O2
"$<$<CONFIG:RELEASE>:-O2>"
-Werror
-Wuninitialized
-pedantic-errors
@@ -131,17 +126,9 @@ target_include_directories(
${FFMPEG_INCLUDE_DIRS}
${OCIO_INCLUDE_DIRS}
${OIIO_INCLUDE_DIRS}
# HACK: Brew on macOS separates the OpenEXR and IlmBase headers while they seem to expect to be
# in the same folder. So we link to that folder directly here.
${ILMBASE_INCLUDES}/OpenEXR
${OPENEXR_INCLUDES}
${OPENEXR_INCLUDE_DIR}
)
message("OpenEXR Includes: " ${OPENEXR_INCLUDES})
message("ILMBASE Includes: " ${ILMBASE_INCLUDES})
# Set link libraries
target_link_libraries(
${OLIVE_TARGET}