Commit cf1e8b69 authored by Gauthier Quesnel's avatar Gauthier Quesnel
Browse files

appveyor: improve

parent 63cff5ea
......@@ -4,8 +4,16 @@ target_link_libraries(app libbaryonyx threads)
set_target_properties(app PROPERTIES
OUTPUT_NAME "baryonyx-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
CXX_STANDARD 17
CXX_STANDARD_REQUIRED ON)
CXX_STANDARD 20)
target_compile_options(app
PRIVATE
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:
-pipe -march=native
$<$<CONFIG:Debug>:-Og -Wall -Wextra>>
$<$<CXX_COMPILER_ID:MSVC>:
/EHsc /bigobj
$<$<CONFIG:Debug>:/Od /W3 /Zi>>)
target_compile_definitions(app
PRIVATE
......
os: Visual Studio 2017
os: Visual Studio 2019
branches:
only:
- master
......@@ -7,35 +7,23 @@ branches:
environment:
matrix:
# - COMPILER: mingw-w64
# GENERATOR: MinGW Makefiles
# PLATFORM: x64
# BUILD_TYPE: RelWithDebInfo
# BINDIR: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin
# - COMPILER: mingw-w64
# GENERATOR: MinGW Makefiles
# PLATFORM: x64
# BUILD_TYPE: Release
# BINDIR: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin
- COMPILER: msvc
GENERATOR: Visual Studio 15 2017 Win64
GENERATOR: Visual Studio 16 2019
PLATFORM: x64
BUILD_TYPE: Debug
- COMPILER: msvc
GENERATOR: Visual Studio 15 2017 Win64
GENERATOR: Visual Studio 16 2019
PLATFORM: x64
BUILD_TYPE: Release
- COMPILER: msvc
GENERATOR: Visual Studio 15 2017
GENERATOR: Visual Studio 16 2019
PLATFORM: Win32
BUILD_TYPE: Debug
- COMPILER: msvc
GENERATOR: Visual Studio 15 2017
GENERATOR: Visual Studio 16 2019
PLATFORM: Win32
BUILD_TYPE: Release
......
......@@ -65,10 +65,10 @@ target_compile_options(libbaryonyx
PRIVATE
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:
-pipe -march=native
$<$<CONFIG:Debug>:-O0 -Wall -Wextra>>
$<$<CONFIG:Debug>:-Og -Wall -Wextra>>
$<$<CXX_COMPILER_ID:MSVC>:
$<$<CONFIG:Debug>:/Od /W3 /Zi>>
$<$<CXX_COMPILER_ID:MSVC>:/bigobj>)
/EHsc /bigobj
$<$<CONFIG:Debug>:/Od /W3 /Zi>>)
target_include_directories(libbaryonyx PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
......@@ -85,8 +85,7 @@ set_target_properties(libbaryonyx PROPERTIES
POSITION_INDEPENDENT_CODE ON
CXX_VISIBILITY_PRESET hidden
VISIBILITY_INLINES_HIDDEN ON
CXX_STANDARD 17
CXX_STANDARD_REQUIRED ON)
CXX_STANDARD 20)
if (CLANG_TIDY_EXE)
set_target_properties(libbaryonyx PROPERTIES
......@@ -150,8 +149,16 @@ function(baryonyx_add_test test_name)
set_target_properties(${test_name} PROPERTIES
COMPILE_DEFINITIONS EXAMPLES_DIR=\"${CMAKE_CURRENT_SOURCE_DIR}/test\"
CXX_STANDARD 17
CXX_STANDARD_REQUIRED ON)
CXX_STANDARD 20)
target_compile_options(${test_name} BEFORE
PRIVATE
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:GNU>>:
-pipe -march=native
$<$<CONFIG:Debug>:-Og -Wall -Wextra>>
$<$<CXX_COMPILER_ID:MSVC>:
/EHsc /bigobj
$<$<CONFIG:Debug>:/Od /W3 /Zi>>)
target_compile_definitions(${test_name}
PRIVATE
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment