CI/CMake: Switch to unix folder layout by default

Author: tstenner

.appveyor.yml

@@ -1,3 +1,4 @@
+
 version: 1.13.{build}
 pull_requests:
   do_not_increment_build_number: true
@@ -9,17 +10,16 @@ environment:
   ARCH: x86
 install:
 - cmd: appveyor DownloadFile https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip -FileName ninja.zip
-- cmd: 7z x ninja.zip -oC:\projects\deps\ninja > nul
-- cmd: set PATH=C:\projects\deps\ninja;%PATH%
+- cmd: 7z x ninja.zip
+- cmd: set PATH=%cd%;%PATH%
 - cmd: ninja --version
 build_script:
 - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio %VCVER%\VC\vcvarsall.bat" %ARCH%
-- mkdir build
+- cmd: cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release %CMakeArgs%
+- sh: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release ${CMakeArgs}
 - cd build
-- cmd: cmake -G Ninja -DCMAKE_BUILD_TYPE=Release %CMakeArgs% ..
-- sh: cmake -DCMAKE_BUILD_TYPE=Release ${CMakeArgs} ..
 - cmake --build . --config Release --target install
-- cpack
+- cpack -C Release
 artifacts:
 - path: 'build/*.7z'
 deploy:

CMakeLists.txt

@@ -10,7 +10,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 if(NOT CMAKE_DEBUG_POSTFIX)
 	set(CMAKE_DEBUG_POSTFIX -debug)
 endif()
-option(LSL_UNIXFOLDERS "Use the unix folder layout for install targets" Off)
+option(LSL_UNIXFOLDERS "Use the unix folder layout for install targets" On)
 option(LSL_NO_FANCY_LIBNAME "Skip library name decorations (32/64/-debug)")
 option(LSL_LEGACY_CPP_ABI "Build legacy C++ ABI" OFF)
 

ci/azure_build_steps.yml

@@ -9,7 +9,7 @@ steps:
     cmakeArgs: '--version'
 - task: CMake@1
   inputs:
-    cmakeArgs: '-DLSL_UNITTESTS=1 -DLSL_UNIXFOLDERS=1 ${{ parameters.cmake_stepvars }} $(cmakeargs) ..'
+    cmakeArgs: '-DLSL_UNITTESTS=1 ${{ parameters.cmake_stepvars }} $(cmakeargs) ..'
   displayName: 'Configure build'
 - task: CMake@1
   inputs: