corrected cmake build

This commit is contained in:
sanctum32 2015-02-03 13:18:15 +00:00 committed by Antz
parent 8ac672ae86
commit ad45b24c59
3 changed files with 31 additions and 31 deletions

View file

@ -14,8 +14,8 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 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") 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}") install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ahbot.conf.dist DESTINATION ${CONF_INSTALL_DIR})
if(WIN32 AND MSVC) if(WIN32 AND MSVC)
add_custom_command(TARGET ${LIBRARY_NAME} add_custom_command(TARGET ${LIBRARY_NAME}

View file

@ -45,21 +45,21 @@ if(WIN32)
endif() endif()
include_directories( include_directories(
"${CMAKE_SOURCE_DIR}/src/shared" ${CMAKE_SOURCE_DIR}/src/shared
"${CMAKE_SOURCE_DIR}/src/framework" ${CMAKE_SOURCE_DIR}/src/framework
"${CMAKE_SOURCE_DIR}/src/game/AuctionHouseBot" ${CMAKE_SOURCE_DIR}/src/game/AuctionHouseBot
"${CMAKE_SOURCE_DIR}/src/game/BattleGround" ${CMAKE_SOURCE_DIR}/src/game/BattleGround
"${CMAKE_SOURCE_DIR}/src/game/Server" ${CMAKE_SOURCE_DIR}/src/game/Server
"${CMAKE_SOURCE_DIR}/src/game/WorldHandlers" ${CMAKE_SOURCE_DIR}/src/game/WorldHandlers
"${CMAKE_SOURCE_DIR}/src/game/Object" ${CMAKE_SOURCE_DIR}/src/game/Object
"${CMAKE_SOURCE_DIR}/src/game/Tools" ${CMAKE_SOURCE_DIR}/src/game/Tools
"${CMAKE_SOURCE_DIR}/src/game/References" ${CMAKE_SOURCE_DIR}/src/game/References
"${CMAKE_SOURCE_DIR}/src/game/MotionGenerators" ${CMAKE_SOURCE_DIR}/src/game/MotionGenerators
"${CMAKE_SOURCE_DIR}/src/game/vmap" ${CMAKE_SOURCE_DIR}/src/game/vmap
"${CMAKE_BINARY_DIR}" ${CMAKE_BINARY_DIR}
"${CMAKE_BINARY_DIR}/src/shared" ${CMAKE_BINARY_DIR}/src/shared
"${ACE_INCLUDE_DIR}" ${ACE_INCLUDE_DIR}
"${OPENSSL_INCLUDE_DIR}" ${OPENSSL_INCLUDE_DIR}
) )
if(SCRIPT_LIB_ELUNA) if(SCRIPT_LIB_ELUNA)
@ -72,13 +72,13 @@ if(SCRIPT_LIB_SD2)
endif() endif()
if(SOAP) if(SOAP)
include_directories("${CMAKE_SOURCE_DIR}/dep/include/gsoap") include_directories(${CMAKE_SOURCE_DIR}/dep/include/gsoap)
endif() endif()
if(POSTGRESQL) if(POSTGRESQL)
include_directories("${PGSQL_INCLUDE_DIR}") include_directories(${PGSQL_INCLUDE_DIR})
else() else()
include_directories("${MYSQL_INCLUDE_DIR}") include_directories(${MYSQL_INCLUDE_DIR})
endif() endif()
add_executable(${EXECUTABLE_NAME} add_executable(${EXECUTABLE_NAME}
@ -144,17 +144,17 @@ if(APPLE)
endif() endif()
set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS
"${EXECUTABLE_LINK_FLAGS}" ${EXECUTABLE_LINK_FLAGS}
) )
install(TARGETS ${EXECUTABLE_NAME} DESTINATION "${BIN_DIR}") install(TARGETS ${EXECUTABLE_NAME} DESTINATION "${BIN_DIR}")
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/mangosd.conf.dist.in" "${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist") 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}") install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mangosd.conf.dist DESTINATION ${CONF_INSTALL_DIR})
if(WIN32 AND MSVC) 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} 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() endif()

View file

@ -90,16 +90,16 @@ if(APPLE)
endif() endif()
set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS set_target_properties(${EXECUTABLE_NAME} PROPERTIES LINK_FLAGS
"${EXECUTABLE_LINK_FLAGS}" ${EXECUTABLE_LINK_FLAGS}
) )
install(TARGETS ${EXECUTABLE_NAME} DESTINATION "${BIN_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") 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(FILES ${CMAKE_CURRENT_BINARY_DIR}/realmd.conf.dist DESTINATION ${CONF_INSTALL_DIR})
if(WIN32 AND MSVC) 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} 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() endif()