Merge 2f90682 into df8901a

izvolov · Aug 10, 2019 · 1d6d165 · 1d6d165
2 parents df8901a + 2f90682
commit 1d6d165
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,10 +12,10 @@ language: cpp
 
   - git clone https://github.com/onqtam/doctest.git third_party/doctest
   - git -C third_party/doctest checkout 2.3.3
-  - /usr/bin/cmake -BBuild/third_party/doctest -Hthird_party/doctest -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=$COMPILER_NAME
+  - /usr/bin/cmake -S third_party/doctest -B Build/third_party/doctest -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=$COMPILER_NAME
   - sudo /usr/bin/cmake --build Build/third_party/doctest --target install/fast
   script:
-  - /usr/bin/cmake -BBuild/mylib -H. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_COMPILER=$COMPILER_NAME
+  - /usr/bin/cmake -S . -B Build/mylib -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_COMPILER=$COMPILER_NAME
   - /usr/bin/cmake --build Build/mylib --target check
 
 .macos-job-template: &macos-job
@@ -28,10 +28,10 @@ language: cpp
   install:
   - git clone https://github.com/onqtam/doctest.git third_party/doctest
   - git -C third_party/doctest checkout 2.3.3
-  - cmake -BBuild/third_party/doctest -Hthird_party/doctest -DCMAKE_BUILD_TYPE=Release
+  - cmake -S third_party/doctest -B Build/third_party/doctest -DCMAKE_BUILD_TYPE=Release
   - sudo cmake --build Build/third_party/doctest --target install/fast
   script:
-  - cmake -BBuild/mylib -H. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+  - cmake -S . -B Build/mylib -DCMAKE_BUILD_TYPE=$BUILD_TYPE
   - cmake --build Build/mylib --target check
 
 .coverage-job-template: &coverage-job
@@ -48,10 +48,10 @@ language: cpp
 
   - git clone https://github.com/onqtam/doctest.git third_party/doctest
   - git -C third_party/doctest checkout 2.3.3
-  - /usr/bin/cmake -BBuild/third_party/doctest -Hthird_party/doctest -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=$COMPILER_NAME
+  - /usr/bin/cmake -S third_party/doctest -B Build/third_party/doctest -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=$COMPILER_NAME
   - sudo /usr/bin/cmake --build Build/third_party/doctest --target install/fast
   script:
-  - /usr/bin/cmake -BBuild/mylib -H. -DCMAKE_BUILD_TYPE=Debug -DMYLIB_COVERAGE=ON
+  - /usr/bin/cmake -S . -B Build/mylib -DCMAKE_BUILD_TYPE=Debug -DMYLIB_COVERAGE=ON
   - /usr/bin/cmake --build Build/mylib --target coverage
   after_success:
   - coveralls --root . --build-root Build/mylib --include include --include src

diff --git a/online/CMakeLists.txt b/online/CMakeLists.txt
@@ -1,10 +1,10 @@
-find_program(PYTHON3_EXECUTABLE python3)
-if(PYTHON3_EXECUTABLE)
+find_package(Python3 COMPONENTS Interpreter)
+if(Python3_FOUND)
     set(WANDBOX_URL "https://wandbox.org/api/compile.json")
 
     add_custom_target(wandbox
         COMMAND
-            ${PYTHON3_EXECUTABLE} wandbox.py mylib_example.cpp "${PROJECT_SOURCE_DIR}" include |
+            Python3::Interpreter wandbox.py mylib_example.cpp "${PROJECT_SOURCE_DIR}" include |
             curl -H "Content-type: application/json" -d @- ${WANDBOX_URL}
         WORKING_DIRECTORY
             ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/online/mylib_example.cpp b/online/mylib_example.cpp
@@ -2,5 +2,6 @@
 
 int main ()
 {
-    mylib::myfunc(mylib::mystruct{});
+    auto s = mylib::mystruct{};
+    static_cast<void>(s);
 }