Adding support for AppVeyor CI

- flyby: make every sub-target unique
STEllAR-GROUP · Jul 3, 2017 · abb18fe · abb18fe
1 parent 93f4496
commit abb18fe
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -125,6 +125,13 @@ if(MSVC)
   if(HPX_WITH_VCPKG)
     hpx_add_config_define(HPX_HAVE_VCPKG)
   endif()
+
+  hpx_option(HPX_WITH_VS_STARTUP_PROJECT STRING
+    "Define the startup project for the HPX solution (default: ALL_BUILD)."
+    "ALL_BUILD" ADVANCED)
+  if(HPX_WITH_VS_STARTUP_PROJECT)
+    set(VS_STARTUP_PROJECT ${HPX_WITH_VS_STARTUP_PROJECT})
+  endif()
 endif()
 
 ################################################################################

diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,44 @@
+#  Copyright (c) 2017 Hartmut Kaiser
+#
+#  Distributed under the Boost Software License, Version 1.0. (See accompanying
+#  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+version: '{branch}-{build}'
+
+branches:
+  only:
+  - appveyor
+
+image:
+  - Visual Studio 2017
+
+configuration:
+  - Debug
+
+platform:
+  - x64
+
+shallow_clone:
+  - true
+
+init:
+  - cmd: git config --global core.autocrlf input
+
+install:
+  - cmd: >-
+    git clone https://github.com/Microsoft/vcpkg C:\projects\vcpkg
+
+    cd C:\projects\vcpkg
+
+    powershell -exec bypass scripts\bootstrap.ps1
+
+    vcpkg install boost:x64-windows hwloc:x64-windows
+
+    cd C:\projects\hpx
+
+before_build:
+  - cmd: cmake -H. -Bbuild -A%PLATFORM% -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=C:/projects/vcpkg/scripts/buildsystems/vcpkg.cmake -DHPX_WITH_GIT_COMMIT=%APPVEYOR_REPO_COMMIT% DHPX_WITH_PSEUDO_DEPENDENCIES=On -DHPX_WITH_VS_STARTUP_PROJECT=core -DHPX_WITH_EXAMPLES=On -DHPX_WITH_TESTS=On
+
+build_script:
+  - cmd: cmake -Bbuild --config Debug --target core -- /maxcpucount:2
+
diff --git a/tests/performance/parallel_algorithms/CMakeLists.txt b/tests/performance/parallel_algorithms/CMakeLists.txt
@@ -8,9 +8,9 @@ set(subdirs
    )
 
 foreach(subdir ${subdirs})
-  add_hpx_pseudo_target(tests.performance.parallel_algorithms.${subdir})
+  add_hpx_pseudo_target(tests.performance.parallel_algorithms.${subdir}_)
   add_subdirectory(${subdir})
   add_hpx_pseudo_dependencies(tests.performance.parallel_algorithms
-                              tests.performance.parallel_algorithms.${subdir})
+                              tests.performance.parallel_algorithms.${subdir}_)
 endforeach()
 
diff --git a/tests/performance/parallel_algorithms/local/CMakeLists.txt b/tests/performance/parallel_algorithms/local/CMakeLists.txt
@@ -21,13 +21,13 @@ foreach(benchmark ${benchmarks})
                      FOLDER "Benchmarks/ParallelAlgorithms/Local")
 
   # add a custom target for this example
-  add_hpx_pseudo_target(tests.performance.parallel_algorithms.local.${benchmark})
+  add_hpx_pseudo_target(tests.performance.parallel_algorithms.local_.${benchmark})
 
   # make pseudo-targets depend on master pseudo-target
-  add_hpx_pseudo_dependencies(tests.performance.parallel_algorithms.local
-                        tests.performance.parallel_algorithms.local.${benchmark})
+  add_hpx_pseudo_dependencies(tests.performance.parallel_algorithms.local_
+                        tests.performance.parallel_algorithms.local_.${benchmark})
 
   # add dependencies to pseudo-target
-  add_hpx_pseudo_dependencies(tests.performance.parallel_algorithms.local.${benchmark}
+  add_hpx_pseudo_dependencies(tests.performance.parallel_algorithms.local_.${benchmark}
                               ${benchmark}_exe)
 endforeach()