Do not show full file paths in diagnostics when building on AppVeyor CI

(the used logger gets confused by those)
STEllAR-GROUP · Jul 5, 2017 · e6fb5d9 · e6fb5d9
1 parent 7bfaa3f
commit e6fb5d9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1280,8 +1280,11 @@ endif()
 
 # Diagnostics
 if(MSVC)
-  # Display full paths in diagnostics
-  hpx_add_compile_flag(-FC LANGUAGES C CXX)
+  # Display full paths in diagnostics, except if build is run under APPVEYOR
+  # as the logger used there gets confused by the full file names.
+  if(NOT HPX_WITH_APPVEYOR)
+    hpx_add_compile_flag(-FC LANGUAGES C CXX)
+  endif()
 else()
   # Show the flags that toggle each warning
   hpx_add_compile_flag_if_available(-fdiagnostics-show-option LANGUAGES CXX C Fortran)

diff --git a/appveyor.yml b/appveyor.yml
@@ -25,7 +25,7 @@ install:
   - cmd: 7z x "C:\projects\vcpkg-export-hpx-dependencies.7z" -y -oC:\projects\vcpkg >NUL
 
 before_build:
-  - cmd: cmake -H. -Bbuild -A%PLATFORM% -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DCMAKE_TOOLCHAIN_FILE=C:/projects/vcpkg/scripts/buildsystems/vcpkg.cmake -DHPX_WITH_GIT_COMMIT=%APPVEYOR_REPO_COMMIT% -DHPX_WITH_PSEUDO_DEPENDENCIES=On -DHPX_WITH_EXAMPLES=On -DHPX_WITH_TESTS=On -DHPX_WITH_RUNTIME=Off
+  - cmd: cmake -H. -Bbuild -A%PLATFORM% -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DCMAKE_TOOLCHAIN_FILE=C:/projects/vcpkg/scripts/buildsystems/vcpkg.cmake -DHPX_WITH_GIT_COMMIT=%APPVEYOR_REPO_COMMIT% -DHPX_WITH_PSEUDO_DEPENDENCIES=On -DHPX_WITH_APPVEYOR=On -DHPX_WITH_EXAMPLES=On -DHPX_WITH_TESTS=On -DHPX_WITH_RUNTIME=Off
 
 build_script:
   - cmd: cmake --build build --config %CONFIGURATION% --target core -- /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /verbosity:minimal /maxcpucount:2 /nologo