Skip to content

Commit

Permalink
Disable tools and tests, update GoogleTest
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielSeemaier committed Jun 15, 2022
1 parent 772afa5 commit 6b51904
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,5 @@ add_definitions(-DMODIFIED_FILES="${MODIFIED_FILES}")
include(gmock)
add_subdirectory(kaminpar)
add_subdirectory(apps)
add_subdirectory(tests)
#add_subdirectory(tests)
add_subdirectory(library)
2 changes: 1 addition & 1 deletion apps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ endfunction()

add_app(KaMinPar kaminpar.cc)

add_subdirectory(tools)
#add_subdirectory(tools)
3 changes: 2 additions & 1 deletion apps/tools/csv_viewer.cc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include <algorithm>
#include <iostream>
#include <sstream>
#include <vector>
Expand Down Expand Up @@ -69,4 +70,4 @@ int main(int argc, char *argv[]) {
}

return 0;
}
}
2 changes: 1 addition & 1 deletion apps/tools/graph_statistics.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* along with KaMinPar. If not, see <http://www.gnu.org/licenses/>.
*
******************************************************************************/
#include "arguments_parser.h"
#include "application/arguments_parser.h"
#include "datastructure/graph.h"
#include "definitions.h"
#include "io.h"
Expand Down
2 changes: 1 addition & 1 deletion apps/tools/verify_partition.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "arguments_parser.h"
#include "application/arguments_parser.h"
#include "datastructure/graph.h"
#include "definitions.h"
#include "io.h"
Expand Down
4 changes: 2 additions & 2 deletions cmake/modules/gmock.cmake
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# taken from http://johnlamp.net/cmake-tutorial-5-functionally-improved-testing.html
function(add_gmock_test target)
add_executable(${target} ${ARGN})
target_link_libraries(${target} gtest gtest_main gmock_main ${CMAKE_THREAD_LIBS_INIT} kaminpar)
target_link_libraries(${target} gtest gtest_main gmock_main ${CMAKE_THREAD_LIBS_INIT} kaminpar_impl)

set_property(TARGET ${target} PROPERTY CXX_STANDARD 20)
set_property(TARGET ${target} PROPERTY CXX_STANDARD_REQUIRED ON)

add_test(${target} ${target})
endfunction()
endfunction()
2 changes: 1 addition & 1 deletion external_tools/googletest
Submodule googletest updated 231 files

0 comments on commit 6b51904

Please sign in to comment.