update config

MolCrafts · Jul 22, 2024 · 8d00df0 · 8d00df0
1 parent c3beab0
commit 8d00df0
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 32 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -27,7 +27,7 @@
                     "ignoreFailures": true
                 }
             ],
-            "preLaunchTask": "test-dev-linux"
+            "preLaunchTask": "build-dev-linux"
         }
 
     ]

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -22,6 +22,9 @@
                 "--preset",
                 "dev-linux"
             ],
+            "dependsOn": [
+                "config-dev-linux"
+            ],
             "group": {
                 "kind": "build"
             },
@@ -35,7 +38,6 @@
                 "dev-linux"
             ],
             "dependsOn": [
-                "config-dev-linux",
                 "build-dev-linux"
             ],
             "group": {

diff --git a/source/molcore.cpp b/source/molcore.cpp
diff --git a/source/space.cpp b/source/space.cpp
@@ -258,9 +258,6 @@ auto Box::isin(const xt::xarray<double> &xyz) const -> xt::xarray<bool>
 {
     return true;
 }
-<<<<<<< HEAD
-} // namespace molcpp
-=======
 
 auto Box::wrap(const xt::xarray<double> &xyz) const -> xt::xarray<double>
 {
@@ -308,4 +305,3 @@ bool operator!=(const Box &rhs, const Box &lhs)
     return !(rhs == lhs);
 }
 } // namespace molcpp
->>>>>>> origin/dev
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -17,22 +17,13 @@ file(GLOB_RECURSE TEST_SOURCES CONFIGURE_DEPENDS "source/*.cpp")
 message(STATUS "find test sources: ${TEST_SOURCES}")
 
 add_executable(molcpp_test ${TEST_SOURCES})
-<<<<<<< HEAD
-target_link_libraries(molcpp_test PRIVATE molcpp::molcpp)
-target_link_libraries(molcpp_test PRIVATE Catch2::Catch2WithMain)
-target_compile_features(molcpp_test PRIVATE cxx_std_20)
-
-include(Catch)
-catch_discover_tests(molcpp_test)
-=======
 set_target_properties(molcpp_test PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
 target_link_libraries(molcpp_test PRIVATE molcpp::molcpp)
 target_link_libraries(molcpp_test PRIVATE doctest::doctest)
 target_compile_features(molcpp_test PRIVATE cxx_std_20)
 
 include(doctest)
 doctest_discover_tests(molcpp_test)
->>>>>>> origin/dev
 
 # ---- End-of-file commands ----
 

diff --git a/test/source/test_space.cpp b/test/source/test_space.cpp
@@ -58,9 +58,6 @@ TEST_CASE("TestBoxUtils")
     }
 }
 
-<<<<<<< HEAD
-} // namespace molcpp
-=======
 TEST_CASE("TestBoxInit")
 {
 
@@ -238,4 +235,3 @@ TEST_CASE("TestBoxDimension")
         CHECK(xt::allclose(triclinic.get_distance_between_faces(), Vec3({10*sind(80), 11*sind(80), 12}), 1e-5));
     }
 }
->>>>>>> origin/dev
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ @@
                         "ignoreFailures": true
                     }
                 ],
-                "preLaunchTask": "test-dev-linux"
+                "preLaunchTask": "build-dev-linux"
             }
         ]
@@ Expand Down @@