Merge remote-tracking branch 'upstream/develop' into Rpath

.appveyor.yml

-image: Previous Visual Studio 2017
+image: Visual Studio 2017
 
 matrix:
   fast_finish: true
@@ -8,35 +8,46 @@ platform:
 
 # http://www.appveyor.com/docs/installed-software
 environment:
-  QTDIR: "C:\\Qt\\5.9\\msvc2017_64"
-  MYCONDA: "C:\\Miniconda3-x64;C:\\Miniconda3-x64\\Scripts;C:\\Miniconda3-x64\\Library\\bin"
-  PATH: "%QTDIR%\\bin;C:\\opt\\local_x64\\lib;%MYCONDA%;%PATH%"
-  PYTHONPATH: "C:\\Miniconda3-x64;C:\\Miniconda3-x64\\Lib;C:\\Miniconda3-x64\\Lib\\site-packages;C:\\Miniconda3-x64\\DLLs"
+  APPVEYOR_RDP_PASSWORD: 7bKajQWvq4uhfpvc!
+  BOOSTDIR: C:\Libraries\boost_1_67_0
+  PYTHONDIR: C:\Python36-x64
+  QTDIR: "C:\\Qt\\5.11\\msvc2017_64"
+  PATH: "%QTDIR%\\bin;%PYTHONDIR%;%PYTHONDIR%\\Scripts;%BOOSTDIR%\\lib64-msvc-14.1;%PATH%"
+  PYTHONPATH: "%PYTHONDIR%;%PYTHONDIR%\\Lib;%PYTHONDIR%\\Lib\\site-packages;%PYTHONDIR%\\DLLs"
 build:
   parallel: true
 
 init:  
-- echo "BornAgain init"
+- echo "BornAgain init" %CD% 
 - echo %PATH%
 
 install:
-- cmd: git submodule -q update --init
+- git submodule -q update --init
   
 before_build:
-- echo "BornAgain before_build"
-- echo %PATH%
+- echo "BornAgain before_build" %CD% 
+- python -m pip install --upgrade pip
 - python -m pip install numpy
-- C:\cygwin\bin\wget -q http://apps.jcns.fz-juelich.de/redmine/attachments/download/348/local_x64.zip -O %temp%\local_x64.zip
-- 7z x %temp%\local_x64.zip -oC:\opt > null
+- mkdir C:\projects\deps
+- C:\cygwin\bin\wget -q http://apps.jcns.fz-juelich.de/redmine/attachments/download/456/bornagaindeps_v1.zip -O %temp%\bornagaindeps.zip
+- 7z x %temp%\bornagaindeps.zip -oC:\projects\deps > null
+- set CMAKE_URL="https://cmake.org/files/v3.12/cmake-3.12.4-win64-x64.zip"
+- appveyor DownloadFile %CMAKE_URL% -FileName %temp%\cmake.zip
+- 7z x %temp%\cmake.zip -oC:\projects\deps > nul
+- move C:\projects\deps\cmake-* C:\projects\deps\cmake # Move to a version-agnostic directory
+- set PATH=C:\projects\deps\bornagaindeps\lib;C:\projects\deps\cmake\bin;%PATH%
 
 build_script:
+- echo "BornAgain build_script" %CD% 
+- echo %PATH%
 - mkdir build
 - cd build
-- cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_INCLUDE_PATH=C:/opt/local_x64/include ..
+- cmake --version
+- cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT=%BOOSTDIR% -DCMAKE_INCLUDE_PATH=C:/projects/deps/bornagaindeps/include ..
 - cmake --build . --config Release
 
 test_script:
-- echo "BornAgain test_script"
+- echo "BornAgain test_script" %CD% 
 - echo %PATH%
 - echo %PYTHONPATH%
 - echo %PYTHONHOME%
@@ -50,3 +61,8 @@ test_script:
         throw "tests failed" 
 
     }
+
+on_failure:
+- appveyor PushArtifact Testing/Temporary/LastTest.log
+#- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+    

cmake/generic/modules/PreventInSourceBuilds.cmake

@@ -6,7 +6,7 @@ function(prevent_in_source_builds)
   get_filename_component(bindir "${CMAKE_BINARY_DIR}" REALPATH)
 
   # disallow in-source builds
-  if("${srcdir}" STREQUAL "${bindir}")
+  if(srcdir STREQUAL bindir)
     message(FATAL_ERROR "\
 
 CMake must not to be run in the source directory. \