Merge pull request #534 from davidonete/upstream-playerbots

Fix
cmangos · Mar 5, 2024 · babe532 · babe532
2 parents 469e3dd + 7753379
commit babe532
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -48,9 +48,9 @@ if(BUILD_PLAYERBOTS)
   add_subdirectory(${playerbots_SOURCE_DIR})
 
 else()
-  # if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/modules/playerbots)
-  #   file(REMOVE_RECURSE ${CMAKE_CURRENT_SOURCE_DIR}/modules/playerbots)
-  # endif()
+  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/modules/playerbots)
+    file(REMOVE_RECURSE ${CMAKE_CURRENT_SOURCE_DIR}/modules/playerbots)
+  endif()
 endif()
 
 if(BUILD_GAME_SERVER)

diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt
@@ -97,7 +97,7 @@ if(WIN32)
 
   if(BUILD_PLAYERBOTS)
     add_custom_command(TARGET ${EXECUTABLE_NAME} POST_BUILD
-	  COMMAND ${CMAKE_COMMAND} -E copy_if_different \"${CMAKE_SOURCE_DIR}/src/modules/PlayerBots/playerbot/aiplayerbot.conf.dist.in\" \"$<TARGET_FILE_DIR:${EXECUTABLE_NAME}>/playerbot.conf.dist\")
+	  COMMAND ${CMAKE_COMMAND} -E copy_if_different \"${CMAKE_SOURCE_DIR}/src/modules/playerbots/playerbot/aiplayerbot.conf.dist.in\" \"$<TARGET_FILE_DIR:${EXECUTABLE_NAME}>/aiplayerbot.conf.dist\")
   endif()
 
   if(BUILD_AHBOT)