diff --git a/src/game/AuctionHouseBot/CMakeLists.txt b/src/game/AuctionHouseBot/CMakeLists.txt index 2a46b15f0..9f14db9f4 100644 --- a/src/game/AuctionHouseBot/CMakeLists.txt +++ b/src/game/AuctionHouseBot/CMakeLists.txt @@ -14,8 +14,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ahbot.conf.dist.in" "${CMAKE_CURRENT_BINARY_DIR}/ahbot.conf.dist") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ahbot.conf.dist" DESTINATION "${CONF_INSTALL_DIR}") +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ahbot.conf.dist.in ${CMAKE_CURRENT_BINARY_DIR}/ahbot.conf.dist) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ahbot.conf.dist DESTINATION ${CONF_INSTALL_DIR}) if(WIN32 AND MSVC) add_custom_command(TARGET ${LIBRARY_NAME} diff --git a/src/mangosd/CMakeLists.txt b/src/mangosd/CMakeLists.txt index 5d60f6978..f8b38ead5 100644 --- a/src/mangosd/CMakeLists.txt +++ b/src/mangosd/CMakeLists.txt @@ -45,21 +45,21 @@ if(WIN32) endif() include_directories( - "${CMAKE_SOURCE_DIR}/src/shared" - "${CMAKE_SOURCE_DIR}/src/framework" - "${CMAKE_SOURCE_DIR}/src/game/AuctionHouseBot" - "${CMAKE_SOURCE_DIR}/src/game/BattleGround" - "${CMAKE_SOURCE_DIR}/src/game/Server" - "${CMAKE_SOURCE_DIR}/src/game/WorldHandlers" - "${CMAKE_SOURCE_DIR}/src/game/Object" - "${CMAKE_SOURCE_DIR}/src/game/Tools" - "${CMAKE_SOURCE_DIR}/src/game/References" - "${CMAKE_SOURCE_DIR}/src/game/MotionGenerators" - "${CMAKE_SOURCE_DIR}/src/game/vmap" - "${CMAKE_BINARY_DIR}" - "${CMAKE_BINARY_DIR}/src/shared" - "${ACE_INCLUDE_DIR}" - "${OPENSSL_INCLUDE_DIR}" + ${CMAKE_SOURCE_DIR}/src/shared + ${CMAKE_SOURCE_DIR}/src/framework + ${CMAKE_SOURCE_DIR}/src/game/AuctionHouseBot + ${CMAKE_SOURCE_DIR}/src/game/BattleGround + ${CMAKE_SOURCE_DIR}/src/game/Server + ${CMAKE_SOURCE_DIR}/src/game/WorldHandlers + ${CMAKE_SOURCE_DIR}/src/game/Object + ${CMAKE_SOURCE_DIR}/src/game/Tools + ${CMAKE_SOURCE_DIR}/src/game/References + ${CMAKE_SOURCE_DIR}/src/game/MotionGenerators + ${CMAKE_SOURCE_DIR}/src/game/vmap + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/src/shared + ${ACE_INCLUDE_DIR} + ${OPENSSL_INCLUDE_DIR} ) if(SCRIPT_LIB_ELUNA) @@ -72,13 +72,13 @@ if(SCRIPT_LIB_SD2) endif() if(SOAP) - include_directories("${CMAKE_SOURCE_DIR}/dep/include/gsoap") + include_directories(${CMAKE_SOURCE_DIR}/dep/include/gsoap) endif() if(POSTGRESQL) - include_directories("${PGSQL_INCLUDE_DIR}") + include_directories(${PGSQL_INCLUDE_DIR}) else() - include_directories("${MYSQL_INCLUDE_DIR}") + include_directories(${MYSQL_INCLUDE_DIR}) endif() add_executable(${EXECUTABLE_NAME} @@ -144,17 +144,17 @@ if(APPLE) endif() set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS - "${EXECUTABLE_LINK_FLAGS}" + ${EXECUTABLE_LINK_FLAGS} ) install(TARGETS ${EXECUTABLE_NAME} DESTINATION "${BIN_DIR}") -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mangosd.conf.dist.in" "${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist" DESTINATION "${CONF_INSTALL_DIR}") +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mangosd.conf.dist.in ${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist DESTINATION ${CONF_INSTALL_DIR}) if(WIN32 AND MSVC) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb" DESTINATION "${BIN_DIR}" CONFIGURATIONS Debug) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb DESTINATION ${BIN_DIR} CONFIGURATIONS Debug) add_custom_command(TARGET ${EXECUTABLE_NAME} - POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist" "${CONF_COPY_DIR}" + POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist ${CONF_COPY_DIR} ) endif() diff --git a/src/realmd/CMakeLists.txt b/src/realmd/CMakeLists.txt index 7772d8c29..c45fdb489 100644 --- a/src/realmd/CMakeLists.txt +++ b/src/realmd/CMakeLists.txt @@ -90,16 +90,16 @@ if(APPLE) endif() set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS - "${EXECUTABLE_LINK_FLAGS}" + ${EXECUTABLE_LINK_FLAGS} ) -install(TARGETS ${EXECUTABLE_NAME} DESTINATION "${BIN_DIR}") -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/realmd.conf.dist.in" "${CMAKE_CURRENT_BINARY_DIR}/realmd.conf.dist") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/realmd.conf.dist" DESTINATION "${CONF_INSTALL_DIR}") +install(TARGETS ${EXECUTABLE_NAME} DESTINATION ${BIN_DIR}) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/realmd.conf.dist.in ${CMAKE_CURRENT_BINARY_DIR}/realmd.conf.dist) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/realmd.conf.dist DESTINATION ${CONF_INSTALL_DIR}) if(WIN32 AND MSVC) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/\${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb" DESTINATION "${BIN_DIR}" CONFIGURATIONS Debug) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BUILD_TYPE}/${EXECUTABLE_NAME}.pdb DESTINATION ${BIN_DIR} CONFIGURATIONS Debug) add_custom_command(TARGET ${EXECUTABLE_NAME} - POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_BINARY_DIR}/realmd.conf.dist" "${CONF_COPY_DIR}" + POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/realmd.conf.dist ${CONF_COPY_DIR} ) endif()