Modularize dependencies of the "amazons" game

google-deepmind · Oct 15, 2023 · 2196524 · 2196524
1 parent 8859b79
commit 2196524
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/open_spiel/games/CMakeLists.txt b/open_spiel/games/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(GAME_SOURCES
-  amazons/amazons.cc
-  amazons/amazons.h
+  $<TARGET_OBJECTS:amazons>
   backgammon/backgammon.cc
   backgammon/backgammon.h
   bargaining/bargaining.cc
@@ -276,9 +275,7 @@ add_executable(2048_test twenty_forty_eight/2048_test.cc ${OPEN_SPIEL_OBJECTS}
                $<TARGET_OBJECTS:tests>)
 add_test(2048_test 2048_test)
 
-add_executable(amazons_test amazons/amazons_test.cc ${OPEN_SPIEL_OBJECTS}
-               $<TARGET_OBJECTS:tests>)
-add_test(amazons_test amazons_test)
+add_subdirectory(amazons)
 
 add_executable(backgammon_test backgammon/backgammon_test.cc ${OPEN_SPIEL_OBJECTS}
                $<TARGET_OBJECTS:tests>)

diff --git a/open_spiel/games/amazons/CMakeLists.txt b/open_spiel/games/amazons/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_library(amazons OBJECT)
+target_sources(amazons PRIVATE amazons.cc amazons.h)
+target_link_libraries(amazons PRIVATE open_spiel_core)
+
+add_executable(amazons_test amazons_test.cc)
+target_link_libraries(amazons_test PRIVATE amazons open_spiel_core tests)
+add_test(amazons_test amazons_test)