From f8127a76d2f3e34571206d6ec003718d9ebcbe1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lien=20Sell=C3=A6g?= Date: Sun, 19 May 2019 19:31:29 +0200 Subject: [PATCH] move cmake project one level up --- tests/python_bindings/CMake_tests/cmake_test.cc | 2 +- .../{CMake_tests => }/cmake_project/CMakeLists.txt | 4 ---- tests/python_bindings/cmake_project/main.cpp | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) rename tests/python_bindings/{CMake_tests => }/cmake_project/CMakeLists.txt (58%) create mode 100644 tests/python_bindings/cmake_project/main.cpp diff --git a/tests/python_bindings/CMake_tests/cmake_test.cc b/tests/python_bindings/CMake_tests/cmake_test.cc index 89d45df..1f79d31 100644 --- a/tests/python_bindings/CMake_tests/cmake_test.cc +++ b/tests/python_bindings/CMake_tests/cmake_test.cc @@ -9,7 +9,7 @@ int main() { auto module = py::module::import("cmake_test"); try { - module.attr("run")((test_suite.test_file_path / suite_name / "cmake_project").string()); + module.attr("run")((test_suite.test_file_path / "cmake_project").string()); test_suite.has_assertion = true; } catch(const py::error_already_set &error){ std::cout << error.what(); diff --git a/tests/python_bindings/CMake_tests/cmake_project/CMakeLists.txt b/tests/python_bindings/cmake_project/CMakeLists.txt similarity index 58% rename from tests/python_bindings/CMake_tests/cmake_project/CMakeLists.txt rename to tests/python_bindings/cmake_project/CMakeLists.txt index 6400f28..c8eae37 100644 --- a/tests/python_bindings/CMake_tests/cmake_project/CMakeLists.txt +++ b/tests/python_bindings/cmake_project/CMakeLists.txt @@ -1,7 +1,3 @@ cmake_minimum_required(VERSION 2.8) - project(cmake_project) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -Wall -Wextra") - add_executable(cmake_project main.cpp) diff --git a/tests/python_bindings/cmake_project/main.cpp b/tests/python_bindings/cmake_project/main.cpp new file mode 100644 index 0000000..76e8197 --- /dev/null +++ b/tests/python_bindings/cmake_project/main.cpp @@ -0,0 +1 @@ +int main() { return 0; }