Remove outdated workaround.
authorM. Eric Irrgang <ericirrgang@gmail.com>
Fri, 11 Sep 2020 13:52:31 +0000 (16:52 +0300)
committerPaul Bauer <paul.bauer.q@gmail.com>
Tue, 15 Sep 2020 13:28:56 +0000 (13:28 +0000)
Remove a workaround left over from before issue #2689 was closed.

Refs #2689

src/api/cpp/tests/CMakeLists.txt

index ee3f1ed8b5de05c3518785dfb51dfbd4e48993a3..893e736182b9c194b6ffd86d2b43ea9af63f7855 100644 (file)
@@ -54,19 +54,14 @@ target_include_directories(gmxapi-testsupport INTERFACE ${CMAKE_CURRENT_SOURCE_D
 gmx_add_gtest_executable(gmxapi-test
     CPP_SOURCE_FILES
         restraint.cpp
+        runner.cpp
         status.cpp
+        stopsignaler.cpp
         system.cpp
         version.cpp
         # pseudo-library for code for mdrun
         $<TARGET_OBJECTS:mdrun_objlib>
         )
-if(NOT GMX_GPU_OPENCL)
-    # GPU resources may not be properly reinitialized between simulations in
-    # the same process.
-    # TODO: include this with the other test sources once the issue is resolved
-    # Ref https://gitlab.com/gromacs/gromacs/-/issues/2689
-    target_sources(gmxapi-test PRIVATE runner.cpp stopsignaler.cpp)
-endif()
 
 # Link against the gmxapi libraries and get access to its public (installed) headers.
 target_link_libraries(gmxapi-test PRIVATE Gromacs::gmxapi gmxapi-testsupport mdrun_test_infrastructure)
@@ -90,19 +85,14 @@ if (GMX_MPI)
     gmx_add_gtest_executable(gmxapi-mpi-test MPI
                              CPP_SOURCE_FILES
                              restraint.cpp
+                             runner.cpp
                              status.cpp
+                             stopsignaler.cpp
                              system.cpp
                              version.cpp
                              # pseudo-library for code for mdrun
                              $<TARGET_OBJECTS:mdrun_objlib>
                              )
-    if(NOT GMX_GPU_OPENCL)
-        # GPU resources may not be properly reinitialized between simulations in
-        # the same process.
-        # TODO: include this with the other test sources once the issue is resolved
-        # Ref https://gitlab.com/gromacs/gromacs/-/issues/2689
-        target_sources(gmxapi-mpi-test PRIVATE runner.cpp stopsignaler.cpp)
-    endif()
 
     target_include_directories(gmxapi-mpi-test PRIVATE
                                ${CMAKE_CURRENT_SOURCE_DIR})