Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revertin Bloody.Rabbit's last three commits since something in them b…

…roke the windows build. Sorry, Bloody.Rabbit :/
  • Loading branch information...
commit 237ae68928d3a9d3907b155e0b2c4609e5dca20d 1 parent 6f63561
@aknorjaden aknorjaden authored
Showing with 495 additions and 3,928 deletions.
  1. +214 −74 CMakeLists.txt
  2. +8 −8 cmake/FindGangsta.cmake
  3. +68 −0 cmake/FindGit.cmake
  4. +2 −2 cmake/FindICONV.cmake
  5. +8 −8 cmake/FindMySQL.cmake
  6. +8 −8 cmake/FindTinyXML.cmake
  7. +7 −7 cmake/FindUTF8CPP.cmake
  8. +0 −49 cmake/GitTreeInfo.cmake
  9. +12 −29 cmake/TargetBuildPCH.cmake
  10. +2 −10 config.h.in
  11. +10 −15 dep/asio/CMakeLists.txt
  12. 0  dep/asio/dummy.cpp
  13. +10 −3,309 dep/boost/CMakeLists.txt
  14. +6 −9 dep/gangsta/CMakeLists.txt
  15. +10 −13 dep/lua/CMakeLists.txt
  16. +0 −82 dep/mysql/CMakeLists.txt
  17. +10 −0 dep/mysql/include/CMakeLists.txt
  18. +6 −23 dep/tinyxml/CMakeLists.txt
  19. +6 −9 dep/utf8cpp/CMakeLists.txt
  20. +6 −9 dep/utils/CMakeLists.txt
  21. +5 −58 dep/zlib/CMakeLists.txt
  22. 0  dep/zlib/New Text Document.txt
  23. +0 −10 doc/CMakeLists.txt
  24. 0  include/eve-server/infogathering/{InfoGatheringMgr.h → infoGatheringMgr.h}
  25. +11 −79 src/common/CMakeLists.txt
  26. +16 −46 src/eve-common/CMakeLists.txt
  27. +28 −38 src/eve-server/CMakeLists.txt
  28. 0  src/eve-server/infogathering/{InfoGatheringMgr.cpp → infoGatheringMgr.cpp}
  29. +5 −0 src/eve-server/mining/Asteroid.cpp
  30. +3 −6 src/eve-server/ship/DestinyManager.cpp
  31. +1 −1  src/eve-server/system/BubbleManager.cpp
  32. +19 −13 src/eve-tool/CMakeLists.txt
  33. +14 −13 src/xmlpktgen/CMakeLists.txt
View
288 CMakeLists.txt
@@ -7,139 +7,279 @@
###############
# CMake setup #
###############
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 FATAL_ERROR )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.6 FATAL_ERROR )
PROJECT( "evemu" )
SET( PROJECT_DESCRIPTION_SUMMARY "A server emulator for EVE Online" )
SET( PROJECT_VENDOR "The EVEmu development team" )
+SET( PROJECT_VERSION "0.7-experimental" )
SET( CMAKE_MODULE_PATH
"${PROJECT_SOURCE_DIR}/cmake"
"${CMAKE_MODULE_PATH}" )
+INCLUDE( "CheckSymbolExists" )
+
+INCLUDE( "TargetBuildPCH" )
+INCLUDE( "TestX64" )
+
###########
# Options #
###########
+SET( EVEMU_COLLECTOR_ENABLE OFF
+ CACHE BOOL "Build eve-collector." )
+SET( EVEMU_DOC_ENABLE OFF
+ CACHE BOOL "Generate HTML documentation (requires Doxygen)." )
+SET( EVEMU_SOURCE_SCM ""
+ CACHE STRING "Source SCM in use; valid values: '', 'svn', 'git'" )
+SET( EVEMU_TOOL_ENABLE OFF
+ CACHE BOOL "Build eve-tool." )
+
SET( EVEMU_ROOT_DIR "..////"
CACHE PATH "The root of EVEmu workspace." )
MARK_AS_ADVANCED( EVEMU_ROOT_DIR )
+SET( TINYXML_USE_STL ON
+ CACHE BOOL "tinyxml will use native STL." )
+MARK_AS_ADVANCED( TINYXML_USE_STL )
+
+# Mark a bunch of stuff as advanced
+MARK_AS_ADVANCED(Boost_DIR Boost_LIB_DIAGNOSTIC_DEFINITIONS CMAKE_INSTALL_PREFIX Lua_DIR)
+
#########
# Tests #
#########
-INCLUDE( "CheckSymbolExists" )
-INCLUDE( "TargetBuildPCH" )
-INCLUDE( "TestX64" )
-
TEST_X64( X64 )
+
CHECK_SYMBOL_EXISTS( "__FreeBSD__" "" FREE_BSD )
+
SET( GNUC ${CMAKE_COMPILER_IS_GNUCXX} )
+################
+# Dependencies #
+################
+FIND_PACKAGE( "Threads" REQUIRED )
+
+IF (WIN32)
+ FIND_PACKAGE( "MySQL" 5.0 QUIET )
+ FIND_PACKAGE( "ZLIB" QUIET )
+ FIND_PACKAGE( "Boost" QUIET )
+ELSE()
+ FIND_PACKAGE( "MySQL" 5.0 REQUIRED )
+ FIND_PACKAGE( "ZLIB" REQUIRED )
+
+ FIND_PACKAGE( "Boost" REQUIRED )
+ LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
+ENDIF (WIN32)
+
+
+IF ( NOT WIN32)
+ FIND_PACKAGE( "ICONV" REQUIRED )
+ENDIF ( NOT WIN32 )
+
+IF( EVEMU_DOC_ENABLE )
+ FIND_PACKAGE( "Doxygen" REQUIRED )
+ENDIF( EVEMU_DOC_ENABLE )
+
+IF( NOT EVEMU_SOURCE_REVISION )
+ IF( EVEMU_SOURCE_SCM STREQUAL "svn" )
+ FIND_PACKAGE( "Subversion" REQUIRED )
+ ELSEIF( EVEMU_SOURCE_SCM STREQUAL "git" )
+ FIND_PACKAGE( "Git" REQUIRED )
+ ENDIF( EVEMU_SOURCE_SCM STREQUAL "svn" )
+ENDIF( NOT EVEMU_SOURCE_REVISION )
+
+FIND_PACKAGE( "Gangsta" QUIET )
+FIND_PACKAGE( "Lua" QUIET )
+FIND_PACKAGE( "TinyXML" QUIET )
+FIND_PACKAGE( "UTF8CPP" QUIET )
+
#################
# Configuration #
#################
+IF( WIN32 )
+ SET( PROJECT_STANDARD_LIBRARIES "wsock32" ${CMAKE_THREAD_LIBS_INIT} )
+ELSE( WIN32 )
+ SET( PROJECT_STANDARD_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} )
+ENDIF( WIN32 )
+
IF( MSVC )
- #
- # This is here as we usually use pre-built MySQL binaries which are
- # compiled with /MT (use static libc); building with /MD (use DLL libc)
- # results in linker warning during the linking stage, however the resultant
- # binary works and is even a little bit smaller due to the dynamic linking.
- #
- # For now we supress the linker warning by forcing static libc.
- #
- #STRING( REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
- #STRING( REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" )
- #STRING( REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}" )
- #STRING( REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}" )
- #STRING( REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" )
-ELSEIF( GNUC )
- #
- # Setup some recommended compiler flags.
- #
- # Intentionally specify the CMAKE_CXX_FLAGS as last to allow user
- # override the setup.
- #
- SET( CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}" )
+ #
+ # This is here as we usually use pre-built MySQL binaries which are
+ # compiled with /MT (use static libc); building with /MD (use DLL libc)
+ # results in linker warning during the linking stage, however the resultant
+ # binary works and is even a little bit smaller due to the dynamic linking.
+ #
+ # For now we supress the linker warning by forcing static libc.
+ #
+ #STRING( REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
+ #STRING( REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" )
+ #STRING( REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}" )
+ #STRING( REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}" )
+ #STRING( REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}" )
+
+ # to avoid linking any boost libs
+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D \"BOOST_DATE_TIME_NO_LIB\" /D \"BOOST_REGEX_NO_LIB\"" )
+
ENDIF( MSVC )
-SET( EVEMU_SOURCE_SCM ""
- CACHE STRING "Source SCM in use; valid values: '', 'svn', 'git'" )
+IF ( NOT MSVC )
+ # to avoid linking any boost libs
+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB" )
+ENDIF ( NOT MSVC )
+
+IF( NOT EVEMU_SOURCE_REVISION )
+ IF( EVEMU_SOURCE_SCM STREQUAL "svn" )
+ Subversion_WC_INFO( "${PROJECT_SOURCE_DIR}" "${PROJECT_NAME}" )
+
+ SET( EVEMU_SOURCE_REVISION "r${${PROJECT_NAME}_WC_LAST_CHANGED_REV}"
+ CACHE STRING "Revision of the source." )
+ MARK_AS_ADVANCED( EVEMU_SOURCE_REVISION )
+ ELSEIF( EVEMU_SOURCE_SCM STREQUAL "git" )
+ GIT_TREE_INFO( "${PROJECT_SOURCE_DIR}" "${PROJECT_NAME}" )
+
+ SET( EVEMU_SOURCE_REVISION "${${PROJECT_NAME}_HASH_SHORT}"
+ CACHE STRING "Revision of the source." )
+ MARK_AS_ADVANCED( EVEMU_SOURCE_REVISION )
+ ENDIF( EVEMU_SOURCE_SCM STREQUAL "svn" )
+ENDIF( NOT EVEMU_SOURCE_REVISION )
+
+IF( EVEMU_SOURCE_REVISION )
+ SET( PROJECT_VERSION "${PROJECT_VERSION}-${EVEMU_SOURCE_REVISION}" )
+ENDIF( EVEMU_SOURCE_REVISION )
+
+############
+# config.h #
+############
+CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/config.h.in"
+ "${PROJECT_BINARY_DIR}/config.h"
+ ESCAPE_QUOTES @ONLY )
-IF( EVEMU_SOURCE_SCM STREQUAL "svn" )
- FIND_PACKAGE( "Subversion" REQUIRED )
- Subversion_WC_INFO( "${PROJECT_SOURCE_DIR}" EVEMU_SVN )
- SET( PROJECT_VERSION "r${EVEMU_SVN_WC_LAST_CHANGED_REV}" )
-ELSEIF( EVEMU_SOURCE_SCM STREQUAL "git" )
- INCLUDE( "GitTreeInfo" )
- GIT_TREE_INFO( "${PROJECT_SOURCE_DIR}" EVEMU_GIT )
- SET( PROJECT_VERSION "${EVEMU_GIT_VERSION}" )
-ENDIF( EVEMU_SOURCE_SCM STREQUAL "svn" )
-
-######################
-# Advertise config.h #
-######################
ADD_DEFINITIONS( "-DHAVE_CONFIG_H" )
INCLUDE_DIRECTORIES( "${PROJECT_BINARY_DIR}" )
+############################
+# Distributed dependencies #
+############################
+ADD_SUBDIRECTORY( "dep/utils" )
+
+IF( NOT GANGSTA_FOUND )
+ ADD_SUBDIRECTORY( "dep/gangsta" )
+
+ SET( GANGSTA_FOUND TRUE )
+ SET( GANGSTA_INCLUDE_DIR "${gangsta_INCLUDE_DIR}" )
+ SET( GANGSTA_LIBRARIES "gangsta" )
+ENDIF( NOT GANGSTA_FOUND )
+
+IF( NOT LUA_FOUND )
+ ADD_SUBDIRECTORY( "dep/lua" )
+
+ SET( LUA_FOUND TRUE )
+ SET( LUA_INCLUDE_DIR "${lua_INCLUDE_DIR}" )
+ SET( LUA_LIBRARIES "lua" )
+ENDIF( NOT LUA_FOUND )
+
+IF( NOT TINYXML_FOUND )
+ ADD_SUBDIRECTORY( "dep/tinyxml" )
+
+ SET( TINYXML_FOUND TRUE )
+ SET( TINYXML_INCLUDE_DIR "${tinyxml_INCLUDE_DIR}" )
+ SET( TINYXML_LIBRARIES "tinyxml" )
+ENDIF( NOT TINYXML_FOUND )
+
+IF( NOT UTF8CPP_FOUND )
+ ADD_SUBDIRECTORY( "dep/utf8cpp" )
+
+ SET( UTF8CPP_FOUND TRUE )
+ SET( UTF8CPP_INCLUDE_DIR "${utf8cpp_INCLUDE_DIR}" )
+ SET( UTF8CPP_LIBRARIES "utf8cpp" )
+ENDIF( NOT UTF8CPP_FOUND )
+
+IF(NOT BOOST_FOUND)
+ ADD_SUBDIRECTORY("dep/boost")
+
+ SET(BOOST_FOUND TRUE)
+ SET(Boost_INCLUDE_DIR "${boost_INCLUDE_DIR}")
+ SET(Boost_DIR "${boost_INCLUDE_DIR}")
+ SET(BOOST_LIBRARIES "boost")
+
+ #LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
+ENDIF(NOT BOOST_FOUND)
+
+IF(NOT MYSQL_FOUND)
+ ADD_SUBDIRECTORY("dep/mysql/include")
+
+ SET(MYSQL_FOUND TRUE)
+ SET(MYSQL_INCLUDE_DIR "${mysql_INCLUDE_DIR}")
+ SET(MYSQL_LIBRARIES "${mysql_INCLUDE_DIR}/../lib/opt/libmysql.lib")
+ENDIF(NOT MYSQL_FOUND)
+
+IF(NOT ZLIB_FOUND)
+ ADD_SUBDIRECTORY("dep/zlib")
+
+ SET(ZLIB_FOUND TRUE)
+ SET(ZLIB_INCLUDE_DIR "${zlib_INCLUDE_DIR}")
+ SET(ZLIB_LIBRARIES "zlib")
+ENDIF(NOT ZLIB_FOUND)
+
+ADD_SUBDIRECTORY( "dep/asio" )
+SET ( ASIO_INCLUDE_DIR "${asio_INCLUDE_DIR}" )
+
+###########################
+# Generated documentation #
+###########################
+IF( EVEMU_DOC_ENABLE )
+ ADD_SUBDIRECTORY( "doc" )
+ENDIF( EVEMU_DOC_ENABLE )
+
##################
# Targets import #
##################
IF( CMAKE_CROSSCOMPILING )
- SET( EVEMU_TARGETS_IMPORT ""
- CACHE FILEPATH "Path to an import script generated during a native build." )
- MARK_AS_ADVANCED( EVEMU_TARGETS_IMPORT )
+ SET( EVEMU_TARGETS_IMPORT ""
+ CACHE FILEPATH "Path to an import script generated during a native build." )
+ MARK_AS_ADVANCED( EVEMU_TARGETS_IMPORT )
- IF( EVEMU_TARGETS_IMPORT )
- INCLUDE( "${EVEMU_TARGETS_IMPORT}" )
- ENDIF( EVEMU_TARGETS_IMPORT )
+ IF( EVEMU_TARGETS_IMPORT )
+ INCLUDE( "${EVEMU_TARGETS_IMPORT}" )
+ ENDIF( EVEMU_TARGETS_IMPORT )
ENDIF( CMAKE_CROSSCOMPILING )
-#################
-# EVEmu targets #
-#################
-SET( EVEMU_COLLECTOR_ENABLE OFF
- CACHE BOOL "Build eve-collector." )
-SET( EVEMU_TOOL_ENABLE OFF
- CACHE BOOL "Build eve-tool." )
-
-ADD_SUBDIRECTORY( "doc" )
+################
+# EVEmu source #
+################
ADD_SUBDIRECTORY( "src/common" )
IF( NOT CMAKE_CROSSCOMPILING )
- ADD_SUBDIRECTORY( "src/xmlpktgen" )
+ ADD_SUBDIRECTORY( "src/xmlpktgen" )
ENDIF( NOT CMAKE_CROSSCOMPILING )
ADD_SUBDIRECTORY( "src/eve-common" )
ADD_SUBDIRECTORY( "src/eve-server" )
IF( EVEMU_COLLECTOR_ENABLE )
- ADD_SUBDIRECTORY( "src/eve-collector" )
+ ADD_SUBDIRECTORY( "src/eve-collector" )
ENDIF( EVEMU_COLLECTOR_ENABLE )
IF( EVEMU_TOOL_ENABLE )
- ADD_SUBDIRECTORY( "src/eve-tool" )
+ ADD_SUBDIRECTORY( "src/eve-tool" )
ENDIF( EVEMU_TOOL_ENABLE )
##################
# Targets export #
##################
IF( NOT CMAKE_CROSSCOMPILING )
- SET( EVEMU_TARGETS_EXPORT ""
- CACHE FILEPATH "Path to an import script to generate (for cross-compiling)." )
- MARK_AS_ADVANCED( EVEMU_TARGETS_EXPORT )
-
- IF( EVEMU_TARGETS_EXPORT )
- EXPORT( TARGETS "xmlpktgen"
- FILE "${EVEMU_TARGETS_EXPORT}" )
- ENDIF( EVEMU_TARGETS_EXPORT )
-ENDIF( NOT CMAKE_CROSSCOMPILING )
+ SET( EVEMU_TARGETS_EXPORT ""
+ CACHE FILEPATH "Path to an import script to generate (for cross-compiling)." )
+ MARK_AS_ADVANCED( EVEMU_TARGETS_EXPORT )
-#####################
-# Generate config.h #
-#####################
-CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/config.h.in"
- "${PROJECT_BINARY_DIR}/config.h"
- ESCAPE_QUOTES @ONLY )
+ IF( EVEMU_TARGETS_EXPORT )
+ EXPORT( TARGETS "xmlpktgen"
+ FILE "${EVEMU_TARGETS_EXPORT}" )
+ ENDIF( EVEMU_TARGETS_EXPORT )
+ENDIF( NOT CMAKE_CROSSCOMPILING )
###############
# CPack setup #
View
16 cmake/FindGangsta.cmake
@@ -1,17 +1,17 @@
# - Find Gangsta
# Find the native Gangsta includes and library
#
-# GANGSTA_FOUND - True if Gangsta found.
-# GANGSTA_INCLUDE_DIRS - where to find GaTypes.h, etc.
-# GANGSTA_LIBRARIES - List of libraries when using Gangsta.
+# GANGSTA_FOUND - True if Gangsta found.
+# GANGSTA_INCLUDE_DIR - where to find GaTypes.h, etc.
+# GANGSTA_LIBRARIES - List of libraries when using Gangsta.
#
-IF( GANGSTA_INCLUDE_DIRS )
+IF( GANGSTA_INCLUDE_DIR )
# Already in cache, be silent
SET( Gangsta_FIND_QUIETLY TRUE )
-ENDIF( GANGSTA_INCLUDE_DIRS )
+ENDIF( GANGSTA_INCLUDE_DIR )
-FIND_PATH( GANGSTA_INCLUDE_DIRS "GaTypes.h"
+FIND_PATH( GANGSTA_INCLUDE_DIR "GaTypes.h"
PATH_SUFFIXES "gangsta" )
FIND_LIBRARY( GANGSTA_LIBRARIES
@@ -21,6 +21,6 @@ FIND_LIBRARY( GANGSTA_LIBRARIES
# handle the QUIETLY and REQUIRED arguments and set GANGSTA_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE( "FindPackageHandleStandardArgs" )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( "Gangsta" DEFAULT_MSG GANGSTA_INCLUDE_DIRS GANGSTA_LIBRARIES )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( "Gangsta" DEFAULT_MSG GANGSTA_INCLUDE_DIR GANGSTA_LIBRARIES )
-MARK_AS_ADVANCED( GANGSTA_INCLUDE_DIRS GANGSTA_LIBRARIES )
+MARK_AS_ADVANCED( GANGSTA_INCLUDE_DIR GANGSTA_LIBRARIES )
View
68 cmake/FindGit.cmake
@@ -0,0 +1,68 @@
+# - Find Git
+# Find a Git SCM client.
+#
+# GIT_FOUND - True if Git was found.
+# GIT_EXECUTABLE - Path to the git binary.
+# GIT_VERSION - Version of found git binary.
+#
+# If Git is found, then following function(s) are defined:
+#
+# GIT_TREE_INFO( DIR PREFIX )
+# Extracts info from given tree.
+# Arguments:
+# DIR - Where the git tree is.
+# PREFIX - A prefix for defined variables.
+# Defined variables:
+# ${PREFIX}_HASH - A hash of HEAD revision.
+# ${PREFIX}_HASH_SHORT - An abbreviation of the hash.
+#
+
+IF( GIT_EXECUTABLE )
+ # Already in cache, be silent
+ SET( Git_FIND_QUIETLY TRUE )
+ENDIF( GIT_EXECUTABLE )
+
+FIND_PROGRAM( GIT_EXECUTABLE "git"
+ DOC "Path to the git binary." )
+
+# handle the QUIETLY and REQUIRED arguments and set GIT_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE( "FindPackageHandleStandardArgs" )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( "Git" DEFAULT_MSG GIT_EXECUTABLE )
+
+MARK_AS_ADVANCED( GIT_EXECUTABLE GIT_VERSION )
+
+IF( GIT_FOUND )
+ EXECUTE_PROCESS( COMMAND "${GIT_EXECUTABLE}" --version
+ OUTPUT_VARIABLE GIT_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE )
+ STRING( REPLACE "git version " "" GIT_VERSION
+ "${GIT_VERSION}" )
+
+ FUNCTION( GIT_TREE_INFO DIR PREFIX )
+ EXECUTE_PROCESS( COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD
+ WORKING_DIRECTORY "${DIR}"
+ RESULT_VARIABLE GIT_RESULT
+ OUTPUT_VARIABLE "${PREFIX}_HASH"
+ ERROR_VARIABLE GIT_ERROR
+ OUTPUT_STRIP_TRAILING_WHITESPACE )
+
+ IF( NOT ${GIT_RESULT} EQUAL 0 )
+ MESSAGE( SEND_ERROR "Command '${GIT_EXECUTABLE} rev-parse HEAD' failed with following output:\n${GIT_ERROR}" )
+ ENDIF( NOT ${GIT_RESULT} EQUAL 0 )
+
+ EXECUTE_PROCESS( COMMAND "${GIT_EXECUTABLE}" rev-parse --short HEAD
+ WORKING_DIRECTORY "${DIR}"
+ RESULT_VARIABLE GIT_RESULT
+ OUTPUT_VARIABLE "${PREFIX}_HASH_SHORT"
+ ERROR_VARIABLE GIT_ERROR
+ OUTPUT_STRIP_TRAILING_WHITESPACE )
+
+ IF( NOT ${GIT_RESULT} EQUAL 0 )
+ MESSAGE( SEND_ERROR "Command '${GIT_EXECUTABLE} rev-parse --short HEAD' failed with following output:\n${GIT_ERROR}" )
+ ENDIF( NOT ${GIT_RESULT} EQUAL 0 )
+
+ SET( "${PREFIX}_HASH" "${${PREFIX}_HASH}" PARENT_SCOPE )
+ SET( "${PREFIX}_HASH_SHORT" "${${PREFIX}_HASH_SHORT}" PARENT_SCOPE )
+ ENDFUNCTION( GIT_TREE_INFO )
+ENDIF( GIT_FOUND )
View
4 cmake/FindICONV.cmake
@@ -94,9 +94,9 @@ if(ICONV_FOUND)
endif()
if(NOT ICONV_ACCEPTS_CONST_INPUT AND NOT ICONV_ACCEPTS_NONCONST_INPUT)
- MESSAGE(FATAL_ERROR "Unable to determine iconv() signature")
+ MESSAGE(FATAL_ERROR "Unebale to determine iconv() signature")
elseif(ICONV_ACCEPTS_CONST_INPUT AND ICONV_ACCEPTS_NONCONST_INPUT)
- MESSAGE(FATAL_ERROR "Unable to determine iconv() signature - both test cases passed!")
+ MESSAGE(FATAL_ERROR "Unebale to determine iconv() signature - both test cases passed!")
endif()
mark_as_advanced(ICONV_LIBRARY ICONV_INCLUDE_DIR)
View
16 cmake/FindMySQL.cmake
@@ -3,17 +3,17 @@
# http://www.cmake.org/Wiki/CMakeUserFindMySQL
# Slightly modified
#
-# MYSQL_FOUND - True if MySQL found.
-# MYSQL_INCLUDE_DIRS - where to find mysql.h, etc.
-# MYSQL_LIBRARIES - List of libraries when using MySQL.
+# MYSQL_FOUND - True if MySQL found.
+# MYSQL_INCLUDE_DIR - where to find mysql.h, etc.
+# MYSQL_LIBRARIES - List of libraries when using MySQL.
#
-IF( MYSQL_INCLUDE_DIRS )
+IF( MYSQL_INCLUDE_DIR )
# Already in cache, be silent
SET( MySQL_FIND_QUIETLY TRUE )
-ENDIF( MYSQL_INCLUDE_DIRS )
+ENDIF( MYSQL_INCLUDE_DIR )
-FIND_PATH( MYSQL_INCLUDE_DIRS "mysql.h"
+FIND_PATH( MYSQL_INCLUDE_DIR "mysql.h"
PATH_SUFFIXES "mysql" )
# we need to find the dynamic library here; it seems to be
@@ -31,6 +31,6 @@ ENDIF( WIN32 )
# handle the QUIETLY and REQUIRED arguments and set MYSQL_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE( "FindPackageHandleStandardArgs" )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( "MySQL" DEFAULT_MSG MYSQL_INCLUDE_DIRS MYSQL_LIBRARIES )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( "MySQL" DEFAULT_MSG MYSQL_INCLUDE_DIR MYSQL_LIBRARIES )
-MARK_AS_ADVANCED( MYSQL_INCLUDE_DIRS MYSQL_LIBRARIES )
+MARK_AS_ADVANCED( MYSQL_INCLUDE_DIR MYSQL_LIBRARIES )
View
16 cmake/FindTinyXML.cmake
@@ -1,17 +1,17 @@
# - Find TinyXML
# Find the native TinyXML includes and library
#
-# TINYXML_FOUND - True if TinyXML found.
-# TINYXML_INCLUDE_DIRS - where to find tinyxml.h, etc.
-# TINYXML_LIBRARIES - List of libraries when using TinyXML.
+# TINYXML_FOUND - True if TinyXML found.
+# TINYXML_INCLUDE_DIR - where to find tinyxml.h, etc.
+# TINYXML_LIBRARIES - List of libraries when using TinyXML.
#
-IF( TINYXML_INCLUDE_DIRS )
+IF( TINYXML_INCLUDE_DIR )
# Already in cache, be silent
SET( TinyXML_FIND_QUIETLY TRUE )
-ENDIF( TINYXML_INCLUDE_DIRS )
+ENDIF( TINYXML_INCLUDE_DIR )
-FIND_PATH( TINYXML_INCLUDE_DIRS "tinyxml.h"
+FIND_PATH( TINYXML_INCLUDE_DIR "tinyxml.h"
PATH_SUFFIXES "tinyxml" )
FIND_LIBRARY( TINYXML_LIBRARIES
@@ -21,6 +21,6 @@ FIND_LIBRARY( TINYXML_LIBRARIES
# handle the QUIETLY and REQUIRED arguments and set TINYXML_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE( "FindPackageHandleStandardArgs" )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( "TinyXML" DEFAULT_MSG TINYXML_INCLUDE_DIRS TINYXML_LIBRARIES )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( "TinyXML" DEFAULT_MSG TINYXML_INCLUDE_DIR TINYXML_LIBRARIES )
-MARK_AS_ADVANCED( TINYXML_INCLUDE_DIRS TINYXML_LIBRARIES )
+MARK_AS_ADVANCED( TINYXML_INCLUDE_DIR TINYXML_LIBRARIES )
View
14 cmake/FindUTF8CPP.cmake
@@ -1,21 +1,21 @@
# - Find UTF8CPP
# Find the native UTF8CPP includes
#
-# UTF8CPP_FOUND - True if UTF8CPP found.
-# UTF8CPP_INCLUDE_DIRS - where to find utf8.h, etc.
+# UTF8CPP_FOUND - True if UTF8CPP found.
+# UTF8CPP_INCLUDE_DIR - where to find utf8.h, etc.
#
-IF( UTF8CPP_INCLUDE_DIRS )
+IF( UTF8CPP_INCLUDE_DIR )
# Already in cache, be silent
SET( UTF8CPP_FIND_QUIETLY TRUE )
-ENDIF( UTF8CPP_INCLUDE_DIRS )
+ENDIF( UTF8CPP_INCLUDE_DIR )
-FIND_PATH( UTF8CPP_INCLUDE_DIRS "utf8.h"
+FIND_PATH( UTF8CPP_INCLUDE_DIR "utf8.h"
PATH_SUFFIXES "utf8cpp" )
# handle the QUIETLY and REQUIRED arguments and set UTF8CPP_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE( "FindPackageHandleStandardArgs" )
-FIND_PACKAGE_HANDLE_STANDARD_ARGS( "UTF8CPP" DEFAULT_MSG UTF8CPP_INCLUDE_DIRS )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( "UTF8CPP" DEFAULT_MSG UTF8CPP_INCLUDE_DIR )
-MARK_AS_ADVANCED( UTF8CPP_INCLUDE_DIRS )
+MARK_AS_ADVANCED( UTF8CPP_INCLUDE_DIR )
View
49 cmake/GitTreeInfo.cmake
@@ -1,49 +0,0 @@
-# - Obtain tree info
-# Obtains useful information about a Git tree.
-#
-# GIT_TREE_INFO( PATH <prefix> )
-# PATH - path to the Git tree
-# <prefix> - prefix for output variables
-#
-# Following variables are defined:
-# <prefix>_BRANCH - name of current branch (may be empty)
-# <prefix>_HASH - short commit hash
-# <prefix>_TAG - current tag (may be empty)
-# <prefix>_VERSION - a nice version string
-#
-
-MACRO( GIT_TREE_INFO PATH PREFIX )
- # Find required Git package
- FIND_PACKAGE( "Git" REQUIRED )
-
- # Obtain branch name
- EXECUTE_PROCESS( COMMAND "${GIT_EXECUTABLE}" symbolic-ref HEAD
- WORKING_DIRECTORY "${PATH}"
- OUTPUT_VARIABLE "${PREFIX}_BRANCH"
- OUTPUT_STRIP_TRAILING_WHITESPACE
- ERROR_QUIET )
- GET_FILENAME_COMPONENT( "${PREFIX}_BRANCH" "${${PREFIX}_BRANCH}" NAME )
-
- # Obtain hash
- EXECUTE_PROCESS( COMMAND "${GIT_EXECUTABLE}" rev-parse --short HEAD
- WORKING_DIRECTORY "${PATH}"
- OUTPUT_VARIABLE "${PREFIX}_HASH"
- OUTPUT_STRIP_TRAILING_WHITESPACE
- ERROR_QUIET )
-
- # Obtain tag
- EXECUTE_PROCESS( COMMAND "${GIT_EXECUTABLE}" describe --tags --exact-match
- WORKING_DIRECTORY "${PATH}"
- OUTPUT_VARIABLE "${PREFIX}_TAG"
- OUTPUT_STRIP_TRAILING_WHITESPACE
- ERROR_QUIET )
-
- # Build a nice version string
- IF( "${PREFIX}_TAG" )
- SET( "${PREFIX}_VERSION" "${${PREFIX}_TAG}" )
- ELSEIF( NOT "${PREFIX}_BRANCH" )
- SET( "${PREFIX}_VERSION" "${${PREFIX}_HASH}" )
- ELSE( "${PREFIX}_TAG" )
- SET( "${PREFIX}_VERSION" "${${PREFIX}_BRANCH}-${${PREFIX}_HASH}" )
- ENDIF( "${PREFIX}_TAG" )
-ENDMACRO( GIT_TREE_INFO )
View
41 cmake/TargetBuildPCH.cmake
@@ -1,35 +1,18 @@
-# - Define a function to build precompiled header for a target
+# - Define macro to build precompiled header for a target
#
-# TARGET_BUILD_PCH( TARGET HEADER SOURCE )
-# Builds a precompiled header while building target.
+# TARGET_BUILD_PCH( TARGET PRECOMPILED_HEADER BOUND_SOURCE )
+# Builds a precompiled header while building target; currently MSVC support only.
# Arguments:
-# TARGET - target to which add the precompiled header
-# HEADER - the header itself
-# SOURCE - the source the header is bound to, i.e. it is built during
-# compilation of given source file
+# TARGET - target to which add the precompiled header
+# PRECOMPILED_HEADER - the header itself
+# BOUND_SOURCE - the source the header is bound to, i.e. it is built during
+# compilation of given source file
#
-FUNCTION( TARGET_BUILD_PCH TARGET HEADER SOURCE )
- GET_FILENAME_COMPONENT( HEADER "${HEADER}" ABSOLUTE )
- GET_FILENAME_COMPONENT( HEADER_NAME "${HEADER}" NAME )
-
+MACRO( TARGET_BUILD_PCH TARGET PRECOMPILED_HEADER BOUND_SOURCE )
IF( MSVC )
- SET_PROPERTY( TARGET "${TARGET}" APPEND PROPERTY COMPILE_FLAGS "/Yu\"${HEADER_NAME}\"" )
- SET_PROPERTY( SOURCE "${SOURCE}" APPEND PROPERTY COMPILE_FLAGS "/Yc\"${HEADER_NAME}\"" )
- ELSE( MSVC )
- SET( CMAKE_CURRENT_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${TARGET}.dir" )
- SET( HEADER_GCH "${CMAKE_CURRENT_OUTPUT_DIR}/${HEADER_NAME}.gch" )
-
- INCLUDE_DIRECTORIES( BEFORE "${CMAKE_CURRENT_OUTPUT_DIR}" )
- ADD_CUSTOM_COMMAND( OUTPUT "${HEADER_GCH}"
- COMMAND "${CMAKE_CXX_COMPILER}"
- ARGS "$(CXX_DEFINES)"
- "$(CXX_FLAGS)"
- -o "${HEADER_GCH}"
- -c "${HEADER}"
- DEPENDS "${CMAKE_CURRENT_OUTPUT_DIR}/flags.make"
- IMPLICIT_DEPENDS "CXX" "${HEADER}" )
-
- SET_PROPERTY( SOURCE ${SOURCE} APPEND PROPERTY OBJECT_DEPENDS "${HEADER_GCH}" )
+ GET_PROPERTY( FLAGS TARGET ${TARGET} PROPERTY COMPILE_FLAGS )
+ SET_PROPERTY( TARGET ${TARGET} PROPERTY COMPILE_FLAGS "${FLAGS} /Yu\"${PRECOMPILED_HEADER}\"" )
+ SET_PROPERTY( SOURCE ${BOUND_SOURCE} PROPERTY COMPILE_FLAGS "${FLAGS} /Yc\"${PRECOMPILED_HEADER}\"" )
ENDIF( MSVC )
-ENDFUNCTION( TARGET_BUILD_PCH )
+ENDMACRO( TARGET_BUILD_PCH )
View
12 config.h.in
@@ -43,14 +43,6 @@
/*
* Configuration
*/
-// BOOST_DATE_TIME_NO_LIB
-// Disable linking of boost date_time library.
-#cmakedefine BOOST_DATE_TIME_NO_LIB 1
-
-// BOOST_REGEX_NO_LIB
-// Disable linking of boost regex library
-#cmakedefine BOOST_REGEX_NO_LIB 1
-
// NDEBUG
// Define this if you want a non-debug (release) build
// CMake passes this as a command-line define.
@@ -63,6 +55,6 @@
// The version of source.
//#define EVEMU_VERSION "@PROJECT_VERSION@"
-// TIXML_USE_STL
+// TINYXML_USE_STL
// Define this if tinyxml should use native STL.
-#cmakedefine TIXML_USE_STL 1
+#cmakedefine TINYXML_USE_STL 1
View
25 dep/asio/CMakeLists.txt
@@ -9,15 +9,7 @@
##############
SET( TARGET_NAME "asio" )
SET( TARGET_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}" )
-SET( TARGET_SOURCE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}" )
-
-SET( TARGET_INCLUDE_DIRS
- "${TARGET_INCLUDE_DIR}" )
-
-# Export directories
-SET( ${TARGET_NAME}_INCLUDE_DIRS
- ${TARGET_INCLUDE_DIRS}
- PARENT_SCOPE )
+SET( TARGET_SOURCE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}" )
#########
# Files #
@@ -25,14 +17,17 @@ SET( ${TARGET_NAME}_INCLUDE_DIRS
SET( INCLUDE
"${TARGET_INCLUDE_DIR}/asio.hpp" )
SET( SOURCE
- "" )
+ "${TARGET_SOURCE_DIR}/dummy.cpp" )
#####################
# Setup the library #
#####################
-INCLUDE_DIRECTORIES( ${TARGET_INCLUDE_DIRS} )
+INCLUDE_DIRECTORIES( "${TARGET_INCLUDE_DIR}" )
+
+ADD_LIBRARY( "${TARGET_NAME}"
+ ${INCLUDE} ${SOURCE} )
-# Since this is header-only library, there are no sources to be built,
-# so we can't use plain ADD_LIBRARY
-ADD_CUSTOM_TARGET( "${TARGET_NAME}"
- ${INCLUDE} ${SOURCE} )
+######################
+# Export directories #
+######################
+SET( ${TARGET_NAME}_INCLUDE_DIR "${TARGET_INCLUDE_DIR}" PARENT_SCOPE )
View
0  dep/asio/dummy.cpp
No changes.
View
3,319 dep/boost/CMakeLists.txt
10 additions, 3,309 deletions not shown
View
15 dep/gangsta/CMakeLists.txt
@@ -11,14 +11,6 @@ SET( TARGET_NAME "gangsta" )
SET( TARGET_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}" )
SET( TARGET_SOURCE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}" )
-SET( TARGET_INCLUDE_DIRS
- "${TARGET_INCLUDE_DIR}" )
-
-# Export directories
-SET( ${TARGET_NAME}_INCLUDE_DIRS
- ${TARGET_INCLUDE_DIRS}
- PARENT_SCOPE )
-
#########
# Files #
#########
@@ -33,7 +25,12 @@ SET( SOURCE
#####################
# Setup the library #
#####################
-INCLUDE_DIRECTORIES( ${TARGET_INCLUDE_DIRS} )
+INCLUDE_DIRECTORIES( "${TARGET_INCLUDE_DIR}" )
ADD_LIBRARY( "${TARGET_NAME}"
${INCLUDE} ${SOURCE} )
+
+######################
+# Export directories #
+######################
+SET( ${TARGET_NAME}_INCLUDE_DIR "${TARGET_INCLUDE_DIR}" PARENT_SCOPE )
View
23 dep/lua/CMakeLists.txt
@@ -9,15 +9,7 @@
##############
SET( TARGET_NAME "lua" )
SET( TARGET_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}/src" )
-SET( TARGET_SOURCE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}/src" )
-
-SET( TARGET_INCLUDE_DIRS
- "${TARGET_INCLUDE_DIR}" )
-
-# Export directories
-SET( ${TARGET_NAME}_INCLUDE_DIRS
- ${TARGET_INCLUDE_DIRS}
- PARENT_SCOPE )
+SET( TARGET_SOURCE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}/src" )
#########
# Files #
@@ -83,12 +75,17 @@ SET( SOURCE
#####################
# Setup the library #
#####################
-INCLUDE_DIRECTORIES( ${TARGET_INCLUDE_DIRS} )
+INCLUDE_DIRECTORIES( "${TARGET_INCLUDE_DIR}" )
ADD_LIBRARY( "${TARGET_NAME}"
${INCLUDE} ${SOURCE} )
+######################
+# Export directories #
+######################
+SET( ${TARGET_NAME}_INCLUDE_DIR "${TARGET_INCLUDE_DIR}" PARENT_SCOPE )
+
# Disable safety warnings because this is a C library
-IF( WIN32 )
- ADD_DEFINITIONS( /D _CRT_SECURE_NO_WARNINGS )
-ENDIF( WIN32 )
+IF (WIN32)
+ ADD_DEFINITIONS(/D _CRT_SECURE_NO_WARNINGS)
+ENDIF (WIN32)
View
82 dep/mysql/CMakeLists.txt
@@ -1,82 +0,0 @@
-#
-# CMake build system file for EVEmu.
-#
-# Author: Bloody.Rabbit
-#
-
-##############
-# Initialize #
-##############
-SET( TARGET_NAME "mysql" )
-SET( TARGET_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}/include" )
-SET( TARGET_LIBRARY_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}/lib" )
-
-SET( TARGET_INCLUDE_DIRS
- "${TARGET_INCLUDE_DIR}" )
-
-# Export directories
-SET( ${TARGET_NAME}_INCLUDE_DIRS
- ${TARGET_INCLUDE_DIRS}
- PARENT_SCOPE )
-SET( ${TARGET_NAME}_LIBRARIES
- "${TARGET_LIBRARY_DIR}/opt/libmysql.lib"
- PARENT_SCOPE )
-
-#########
-# Files #
-#########
-SET( INCLUDE
- "${TARGET_INCLUDE_DIR}/config-win.h"
- "${TARGET_INCLUDE_DIR}/decimal.h"
- "${TARGET_INCLUDE_DIR}/errmsg.h"
- "${TARGET_INCLUDE_DIR}/keycache.h"
- "${TARGET_INCLUDE_DIR}/m_ctype.h"
- "${TARGET_INCLUDE_DIR}/m_string.h"
- "${TARGET_INCLUDE_DIR}/my_alloc.h"
- "${TARGET_INCLUDE_DIR}/my_attribute.h"
- "${TARGET_INCLUDE_DIR}/my_compiler.h"
- "${TARGET_INCLUDE_DIR}/my_dbug.h"
- "${TARGET_INCLUDE_DIR}/my_dir.h"
- "${TARGET_INCLUDE_DIR}/my_getopt.h"
- "${TARGET_INCLUDE_DIR}/my_global.h"
- "${TARGET_INCLUDE_DIR}/my_list.h"
- "${TARGET_INCLUDE_DIR}/my_net.h"
- "${TARGET_INCLUDE_DIR}/my_no_pthread.h"
- "${TARGET_INCLUDE_DIR}/my_pthread.h"
- "${TARGET_INCLUDE_DIR}/mysql_com.h"
- "${TARGET_INCLUDE_DIR}/mysqld_ername.h"
- "${TARGET_INCLUDE_DIR}/mysqld_error.h"
- "${TARGET_INCLUDE_DIR}/mysql_embed.h"
- "${TARGET_INCLUDE_DIR}/mysql.h"
- "${TARGET_INCLUDE_DIR}/mysql_time.h"
- "${TARGET_INCLUDE_DIR}/mysql_version.h"
- "${TARGET_INCLUDE_DIR}/my_sys.h"
- "${TARGET_INCLUDE_DIR}/my_xml.h"
- "${TARGET_INCLUDE_DIR}/sql_common.h"
- "${TARGET_INCLUDE_DIR}/sql_state.h"
- "${TARGET_INCLUDE_DIR}/sslopt-case.h"
- "${TARGET_INCLUDE_DIR}/sslopt-longopts.h"
- "${TARGET_INCLUDE_DIR}/sslopt-vars.h"
- "${TARGET_INCLUDE_DIR}/typelib.h" )
-SET( SOURCE
- "" )
-
-SET( mysql_INCLUDE
- "${TARGET_INCLUDE_DIR}/mysql/plugin.h" )
-SET( mysql_SOURCE
- "" )
-
-#####################
-# Setup the library #
-#####################
-INCLUDE_DIRECTORIES( ${TARGET_INCLUDE_DIRS} )
-
-SOURCE_GROUP( "include" FILES ${INCLUDE} )
-SOURCE_GROUP( "include\\mysql" FILES ${mysql_INCLUDE} )
-
-SOURCE_GROUP( "src" FILES ${SOURCE} )
-SOURCE_GROUP( "src\\mysql" FILES ${mysql_SOURCE} )
-
-ADD_CUSTOM_TARGET( "${TARGET_NAME}"
- SOURCES ${INCLUDE} ${SOURCE}
- ${mysql_INCLUDE} ${mysql_SOURCE} )
View
10 dep/mysql/include/CMakeLists.txt
@@ -0,0 +1,10 @@
+SET(TARGET_NAME "mysql")
+FILE(GLOB_RECURSE EXECUTABLE_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h *.hpp *.c)
+
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+ADD_LIBRARY("${TARGET_NAME}" ${EXECUTABLE_SRCS})
+
+SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES LINKER_LANGUAGE C)
+
+SET( ${TARGET_NAME}_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PARENT_SCOPE )
View
29 dep/tinyxml/CMakeLists.txt
@@ -11,25 +11,6 @@ SET( TARGET_NAME "tinyxml" )
SET( TARGET_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}" )
SET( TARGET_SOURCE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}" )
-SET( TARGET_INCLUDE_DIRS
- "${TARGET_INCLUDE_DIR}" )
-
-# Export directories
-SET( ${TARGET_NAME}_INCLUDE_DIRS
- ${TARGET_INCLUDE_DIRS}
- PARENT_SCOPE )
-
-#################
-# Configuration #
-#################
-SET( TIXML_USE_STL ON
- CACHE BOOL "tinyxml will use native STL." )
-MARK_AS_ADVANCED( TIXML_USE_STL )
-
-IF( TIXML_USE_STL )
- ADD_DEFINITIONS( "-DTIXML_USE_STL=1" )
-ENDIF( TIXML_USE_STL )
-
#########
# Files #
#########
@@ -45,10 +26,12 @@ SET( SOURCE
#####################
# Setup the library #
#####################
-INCLUDE_DIRECTORIES( ${TARGET_INCLUDE_DIRS} )
-
-SOURCE_GROUP( "include" INCLUDE )
-SOURCE_GROUP( "src" SOURCE )
+INCLUDE_DIRECTORIES( "${TARGET_INCLUDE_DIR}" )
ADD_LIBRARY( "${TARGET_NAME}"
${INCLUDE} ${SOURCE} )
+
+######################
+# Export directories #
+######################
+SET( ${TARGET_NAME}_INCLUDE_DIR "${TARGET_INCLUDE_DIR}" PARENT_SCOPE )
View
15 dep/utf8cpp/CMakeLists.txt
@@ -11,14 +11,6 @@ SET( TARGET_NAME "utf8cpp" )
SET( TARGET_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}" )
SET( TARGET_SOURCE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}" )
-SET( TARGET_INCLUDE_DIRS
- "${TARGET_INCLUDE_DIR}" )
-
-# Export directories
-SET( ${TARGET_NAME}_INCLUDE_DIRS
- ${TARGET_INCLUDE_DIRS}
- PARENT_SCOPE )
-
#########
# Files #
#########
@@ -33,9 +25,14 @@ SET( SOURCE
#####################
# Setup the library #
#####################
-INCLUDE_DIRECTORIES( ${TARGET_INCLUDE_DIRS} )
+INCLUDE_DIRECTORIES( "${TARGET_INCLUDE_DIR}" )
# Since this is header-only library, there are no sources to be built,
# so we can't use plain ADD_LIBRARY
ADD_CUSTOM_TARGET( "${TARGET_NAME}"
SOURCES ${INCLUDE} ${SOURCE} )
+
+######################
+# Export directories #
+######################
+SET( ${TARGET_NAME}_INCLUDE_DIR "${TARGET_INCLUDE_DIR}" PARENT_SCOPE )
View
15 dep/utils/CMakeLists.txt
@@ -11,14 +11,6 @@ SET( TARGET_NAME "utils" )
SET( TARGET_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}" )
SET( TARGET_SOURCE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}" )
-SET( TARGET_INCLUDE_DIRS
- "${TARGET_INCLUDE_DIR}" )
-
-# Export directories
-SET( ${TARGET_NAME}_INCLUDE_DIRS
- ${TARGET_INCLUDE_DIRS}
- PARENT_SCOPE )
-
#########
# Files #
#########
@@ -32,7 +24,12 @@ SET( SOURCE
#####################
# Setup the library #
#####################
-INCLUDE_DIRECTORIES( ${TARGET_INCLUDE_DIRS} )
+INCLUDE_DIRECTORIES( "${TARGET_INCLUDE_DIR}" )
ADD_LIBRARY( "${TARGET_NAME}"
${INCLUDE} ${SOURCE} )
+
+######################
+# Export directories #
+######################
+SET( ${TARGET_NAME}_INCLUDE_DIR "${TARGET_INCLUDE_DIR}" PARENT_SCOPE )
View
63 dep/zlib/CMakeLists.txt
@@ -1,61 +1,8 @@
-#
-# CMake build system file for EVEmu.
-#
-# Author: Bloody.Rabbit
-#
+SET(TARGET_NAME "zlib")
+FILE(GLOB_RECURSE EXECUTABLE_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h *.hpp *.c)
-##############
-# Initialize #
-##############
-SET( TARGET_NAME "zlib" )
-SET( TARGET_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}" )
-SET( TARGET_SOURCE_DIR "${PROJECT_SOURCE_DIR}/dep/${TARGET_NAME}" )
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-SET( TARGET_INCLUDE_DIRS
- "${TARGET_INCLUDE_DIR}" )
+ADD_LIBRARY("${TARGET_NAME}" ${EXECUTABLE_SRCS})
-# Export directories
-SET( ${TARGET_NAME}_INCLUDE_DIRS
- ${TARGET_INCLUDE_DIRS}
- PARENT_SCOPE )
-
-#########
-# Files #
-#########
-SET( INCLUDE
- "${TARGET_INCLUDE_DIR}/crc32.h"
- "${TARGET_INCLUDE_DIR}/deflate.h"
- "${TARGET_INCLUDE_DIR}/gzguts.h"
- "${TARGET_INCLUDE_DIR}/inffast.h"
- "${TARGET_INCLUDE_DIR}/inffixed.h"
- "${TARGET_INCLUDE_DIR}/inflate.h"
- "${TARGET_INCLUDE_DIR}/inftrees.h"
- "${TARGET_INCLUDE_DIR}/trees.h"
- "${TARGET_INCLUDE_DIR}/zconf.h"
- "${TARGET_INCLUDE_DIR}/zlib.h"
- "${TARGET_INCLUDE_DIR}/zutil.h" )
-
-SET( SOURCE
- "${TARGET_SOURCE_DIR}/adler32.c"
- "${TARGET_SOURCE_DIR}/compress.c"
- "${TARGET_SOURCE_DIR}/crc32.c"
- "${TARGET_SOURCE_DIR}/deflate.c"
- "${TARGET_SOURCE_DIR}/gzclose.c"
- "${TARGET_SOURCE_DIR}/gzlib.c"
- "${TARGET_SOURCE_DIR}/gzread.c"
- "${TARGET_SOURCE_DIR}/gzwrite.c"
- "${TARGET_SOURCE_DIR}/infback.c"
- "${TARGET_SOURCE_DIR}/inffast.c"
- "${TARGET_SOURCE_DIR}/inflate.c"
- "${TARGET_SOURCE_DIR}/inftrees.c"
- "${TARGET_SOURCE_DIR}/trees.c"
- "${TARGET_SOURCE_DIR}/uncompr.c"
- "${TARGET_SOURCE_DIR}/zutil.c" )
-
-#####################
-# Setup the library #
-#####################
-INCLUDE_DIRECTORIES( ${TARGET_INCLUDE_DIRS} )
-
-ADD_LIBRARY( "${TARGET_NAME}"
- ${INCLUDE} ${SOURCE} )
+SET( ${TARGET_NAME}_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" PARENT_SCOPE )
View
0  dep/zlib/New Text Document.txt
No changes.
View
10 doc/CMakeLists.txt
@@ -4,16 +4,6 @@
# Author: Bloody.Rabbit
#
-################
-# Dependencies #
-################
-FIND_PACKAGE( "Doxygen" )
-
-IF( NOT DOXYGEN_FOUND )
- MESSAGE( STATUS "WARNING: Generated documentation won't be available" )
- RETURN()
-ENDIF( NOT DOXYGEN_FOUND )
-
##############
# Initialize #
##############
View
0  ...e-server/infogathering/InfoGatheringMgr.h → ...e-server/infogathering/infoGatheringMgr.h
File renamed without changes
View
90 src/common/CMakeLists.txt
@@ -4,60 +4,6 @@
# Author: Bloody.Rabbit
#
-################
-# Dependencies #
-################
-FIND_PACKAGE( "Threads" REQUIRED )
-
-FIND_PACKAGE( "Gangsta" QUIET )
-FIND_PACKAGE( "TinyXML" QUIET )
-FIND_PACKAGE( "ZLIB" QUIET )
-
-IF( NOT GANGSTA_FOUND )
- ADD_SUBDIRECTORY( "${PROJECT_SOURCE_DIR}/dep/gangsta"
- "${PROJECT_BINARY_DIR}/dep/gangsta" )
-
- SET( GANGSTA_FOUND TRUE )
- SET( GANGSTA_INCLUDE_DIRS ${gangsta_INCLUDE_DIRS} )
- SET( GANGSTA_LIBRARIES "gangsta" )
-ENDIF( NOT GANGSTA_FOUND )
-
-IF( NOT TINYXML_FOUND )
- ADD_SUBDIRECTORY( "${PROJECT_SOURCE_DIR}/dep/tinyxml"
- "${PROJECT_BINARY_DIR}/dep/tinyxml" )
-
- SET( TINYXML_FOUND TRUE )
- SET( TINYXML_INCLUDE_DIRS ${tinyxml_INCLUDE_DIRS} )
- SET( TINYXML_LIBRARIES "tinyxml" )
-ENDIF( NOT TINYXML_FOUND )
-
-IF( NOT ZLIB_FOUND )
- ADD_SUBDIRECTORY( "${PROJECT_SOURCE_DIR}/dep/zlib"
- "${PROJECT_BINARY_DIR}/dep/zlib" )
-
- SET( ZLIB_FOUND TRUE )
- SET( ZLIB_INCLUDE_DIRS ${zlib_INCLUDE_DIRS} )
- SET( ZLIB_LIBRARIES "zlib" )
-ENDIF( NOT ZLIB_FOUND )
-
-#######################
-# Binary dependencies #
-#######################
-IF( NOT WIN32 )
- FIND_PACKAGE( "MySQL" 5.0 REQUIRED )
-ELSE()
- FIND_PACKAGE( "MySQL" 5.0 QUIET )
-
- IF( NOT MYSQL_FOUND )
- ADD_SUBDIRECTORY( "${PROJECT_SOURCE_DIR}/dep/mysql"
- "${PROJECT_BINARY_DIR}/dep/mysql" )
-
- SET( MYSQL_FOUND TRUE )
- SET( MYSQL_INCLUDE_DIRS ${mysql_INCLUDE_DIRS} )
- SET( MYSQL_LIBRARIES ${mysql_LIBRARIES} )
- ENDIF( NOT MYSQL_FOUND )
-ENDIF( NOT WIN32 )
-
##############
# Initialize #
##############
@@ -65,18 +11,6 @@ SET( TARGET_NAME "common" )
SET( TARGET_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/include/${TARGET_NAME}" )
SET( TARGET_SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/${TARGET_NAME}" )
-SET( TARGET_INCLUDE_DIRS
- ${MYSQL_INCLUDE_DIRS}
- ${GANGSTA_INCLUDE_DIRS}
- ${TINYXML_INCLUDE_DIRS}
- ${ZLIB_INCLUDE_DIRS}
- "${TARGET_INCLUDE_DIR}" )
-
-# Export directories
-SET( ${TARGET_NAME}_INCLUDE_DIRS
- ${TARGET_INCLUDE_DIRS}
- PARENT_SCOPE )
-
#########
# Files #
#########
@@ -153,7 +87,11 @@ SET( utils_SOURCE
#####################
# Setup the library #
#####################
-INCLUDE_DIRECTORIES( ${TARGET_INCLUDE_DIRS} )
+INCLUDE_DIRECTORIES( "${MYSQL_INCLUDE_DIR}" )
+INCLUDE_DIRECTORIES( "${TINYXML_INCLUDE_DIR}" )
+INCLUDE_DIRECTORIES( "${ZLIB_INCLUDE_DIR}" )
+
+INCLUDE_DIRECTORIES( "${TARGET_INCLUDE_DIR}" )
SOURCE_GROUP( "include" FILES ${INCLUDE} )
SOURCE_GROUP( "include\\database" FILES ${database_INCLUDE} )
@@ -178,16 +116,10 @@ ADD_LIBRARY( "${TARGET_NAME}"
${utils_INCLUDE} ${utils_SOURCE} )
TARGET_BUILD_PCH( "${TARGET_NAME}"
- "${TARGET_INCLUDE_DIR}/CommonPCH.h"
- "${TARGET_SOURCE_DIR}/common.cpp" )
-TARGET_LINK_LIBRARIES( "${TARGET_NAME}"
- ${MYSQL_LIBRARIES}
- ${GANGSTA_LIBRARIES}
- ${TINYXML_LIBRARIES}
- ${ZLIB_LIBRARIES}
- ${CMAKE_THREAD_LIBS_INIT} )
+ "CommonPCH.h"
+ "common.cpp" )
-IF( WIN32 )
- TARGET_LINK_LIBRARIES( "${TARGET_NAME}"
- "wsock32" )
-ENDIF( WIN32 )
+######################
+# Export directories #
+######################
+SET( ${TARGET_NAME}_INCLUDE_DIR "${TARGET_INCLUDE_DIR}" PARENT_SCOPE )
View
62 src/eve-common/CMakeLists.txt
@@ -4,34 +4,6 @@
# Author: Bloody.Rabbit
#
-################
-# Dependencies #
-################
-ADD_SUBDIRECTORY( "${PROJECT_SOURCE_DIR}/dep/utils"
- "${PROJECT_BINARY_DIR}/dep/utils" )
-
-FIND_PACKAGE( "Boost" QUIET )
-FIND_PACKAGE( "UTF8CPP" QUIET )
-MARK_AS_ADVANCED( Boost_DIR Boost_LIB_DIAGNOSTIC_DEFINITIONS )
-
-IF( NOT Boost_FOUND )
- ADD_SUBDIRECTORY( "${PROJECT_SOURCE_DIR}/dep/boost"
- "${PROJECT_BINARY_DIR}/dep/boost" )
-
- SET( Boost_FOUND TRUE )
- SET( Boost_INCLUDE_DIRS ${boost_INCLUDE_DIRS} )
- SET( Boost_LIBRARIES "boost" )
-ENDIF( NOT Boost_FOUND )
-
-IF( NOT UTF8CPP_FOUND )
- ADD_SUBDIRECTORY( "${PROJECT_SOURCE_DIR}/dep/utf8cpp"
- "${PROJECT_BINARY_DIR}/dep/utf8cpp" )
-
- SET( UTF8CPP_FOUND TRUE )
- SET( UTF8CPP_INCLUDE_DIRS ${utf8cpp_INCLUDE_DIRS} )
- SET( UTF8CPP_LIBRARIES "utf8cpp" )
-ENDIF( NOT UTF8CPP_FOUND )
-
##############
# Initialize #
##############
@@ -40,19 +12,6 @@ SET( TARGET_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/include/${TARGET_NAME}" )
SET( TARGET_SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/${TARGET_NAME}" )
SET( TARGET_PACKETS_DIR "${PROJECT_BINARY_DIR}/src/${TARGET_NAME}" )
-SET( TARGET_INCLUDE_DIRS
- ${Boost_INCLUDE_DIRS}
- ${UTF8CPP_INCLUDE_DIRS}
- ${utils_INCLUDE_DIRS}
- ${common_INCLUDE_DIRS}
- "${TARGET_INCLUDE_DIR}"
- "${TARGET_PACKETS_DIR}" )
-
-# Export directories
-SET( ${TARGET_NAME}_INCLUDE_DIRS
- ${TARGET_INCLUDE_DIRS}
- PARENT_SCOPE )
-
#########
# Files #
#########
@@ -210,7 +169,14 @@ SET( utils_SOURCE
#####################
# Setup the library #
#####################
-INCLUDE_DIRECTORIES( ${TARGET_INCLUDE_DIRS} )
+INCLUDE_DIRECTORIES( "${MYSQL_INCLUDE_DIR}" )
+INCLUDE_DIRECTORIES( "${UTF8CPP_INCLUDE_DIR}" )
+
+INCLUDE_DIRECTORIES( "${utils_INCLUDE_DIR}" )
+
+INCLUDE_DIRECTORIES( "${common_INCLUDE_DIR}" )
+INCLUDE_DIRECTORIES( "${TARGET_INCLUDE_DIR}" )
+INCLUDE_DIRECTORIES( "${TARGET_PACKETS_DIR}" )
SOURCE_GROUP( "include" FILES ${INCLUDE} )
SOURCE_GROUP( "include\\cache" FILES ${cache_INCLUDE} )
@@ -260,7 +226,11 @@ ADD_LIBRARY( "${TARGET_NAME}"
${utils_INCLUDE} ${utils_SOURCE} )
TARGET_BUILD_PCH( "${TARGET_NAME}"
- "${TARGET_INCLUDE_DIR}/EVECommonPCH.h"
- "${TARGET_SOURCE_DIR}/utils/EVEUtils.cpp" )
-TARGET_LINK_LIBRARIES( "${TARGET_NAME}"
- "common" "utils" )
+ "EVECommonPCH.h"
+ "utils/EVEUtils.cpp" )
+
+######################
+# Export directories #
+######################
+SET( ${TARGET_NAME}_INCLUDE_DIR "${TARGET_INCLUDE_DIR}" PARENT_SCOPE )
+SET( ${TARGET_NAME}_PACKETS_DIR "${TARGET_PACKETS_DIR}" PARENT_SCOPE )
View
66 src/eve-server/CMakeLists.txt
@@ -4,28 +4,6 @@
# Author: Bloody.Rabbit
#
-################
-# Dependencies #
-################
-ADD_SUBDIRECTORY( "${PROJECT_SOURCE_DIR}/dep/asio"
- "${PROJECT_BINARY_DIR}/dep/asio" )
-
-FIND_PACKAGE( "Lua" QUIET )
-MARK_AS_ADVANCED( Lua_DIR )
-
-IF( NOT WIN32 )
- FIND_PACKAGE( "ICONV" REQUIRED )
-ENDIF( NOT WIN32 )
-
-IF( NOT LUA_FOUND )
- ADD_SUBDIRECTORY( "${PROJECT_SOURCE_DIR}/dep/lua"
- "${PROJECT_BINARY_DIR}/dep/lua" )
-
- SET( LUA_FOUND TRUE )
- SET( LUA_INCLUDE_DIRS ${lua_INCLUDE_DIRS} )
- SET( LUA_LIBRARIES "lua" )
-ENDIF( NOT LUA_FOUND )
-
##############
# Initialize #
##############
@@ -34,17 +12,6 @@ SET( TARGET_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/include/${TARGET_NAME}" )
SET( TARGET_SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/${TARGET_NAME}" )
SET( TARGET_UTILS_DIR "${PROJECT_SOURCE_DIR}/utils" )
-SET( TARGET_INCLUDE_DIRS
- ${LUA_INCLUDE_DIRS}
- ${asio_INCLUDE_DIRS}
- ${eve-common_INCLUDE_DIRS}
- "${TARGET_INCLUDE_DIR}" )
-
-# Export directories
-SET( ${TARGET_NAME}_INCLUDE_DIRS
- ${TARGET_INCLUDE_DIRS}
- PARENT_SCOPE )
-
#########
# Files #
#########
@@ -148,16 +115,19 @@ SET( authorisation_INCLUDE
"${TARGET_INCLUDE_DIR}/authorisation/BinAsciiModule.h"
"${TARGET_INCLUDE_DIR}/authorisation/PasswordModule.h"
"${TARGET_INCLUDE_DIR}/authorisation/ShaModule.h" )
+
SET( authorisation_SOURCE
"${TARGET_SOURCE_DIR}/authorisation/PasswordModule.cpp" )
SET( browser_INCLUDE
"${TARGET_INCLUDE_DIR}/browser/browserLockdownSvc.h" )
+
SET( browser_SOURCE
"${TARGET_SOURCE_DIR}/browser/browserLockdownSvc.cpp" )
SET( bulk_INCLUDE
"${TARGET_INCLUDE_DIR}/bulk/BulkMgrService.h" )
+
SET( bulk_SOURCE
"${TARGET_SOURCE_DIR}/bulk/BulkMgrService.cpp" )
@@ -544,7 +514,19 @@ SET( imageserver_SOURCE
########################
# Setup the executable #
########################
-INCLUDE_DIRECTORIES( ${TARGET_INCLUDE_DIRS} )
+INCLUDE_DIRECTORIES( "${GANGSTA_INCLUDE_DIR}" )
+INCLUDE_DIRECTORIES( "${MYSQL_INCLUDE_DIR}" )
+INCLUDE_DIRECTORIES( "${LUA_INCLUDE_DIR}" )
+INCLUDE_DIRECTORIES( "${TINYXML_INCLUDE_DIR}" )
+INCLUDE_DIRECTORIES( "${UTF8CPP_INCLUDE_DIR}" )
+INCLUDE_DIRECTORIES( "${ASIO_INCLUDE_DIR}" )
+
+INCLUDE_DIRECTORIES( "${utils_INCLUDE_DIR}" )
+
+INCLUDE_DIRECTORIES( "${common_INCLUDE_DIR}" )
+INCLUDE_DIRECTORIES( "${eve-common_INCLUDE_DIR}" )
+INCLUDE_DIRECTORIES( "${eve-common_PACKETS_DIR}" )
+INCLUDE_DIRECTORIES( "${TARGET_INCLUDE_DIR}" )
SOURCE_GROUP( "include" FILES ${INCLUDE} )
SOURCE_GROUP( "include\\account" FILES ${account_INCLUDE} )
@@ -665,13 +647,21 @@ ADD_EXECUTABLE( "${TARGET_NAME}"
${apiserver_INCLUDE} ${apiserver_SOURCE} )
TARGET_BUILD_PCH( "${TARGET_NAME}"
- "${TARGET_INCLUDE_DIR}/EVEServerPCH.h"
- "${TARGET_SOURCE_DIR}/main.cpp" )
+ "EVEServerPCH.h"
+ "main.cpp" )
TARGET_LINK_LIBRARIES( "${TARGET_NAME}"
- "eve-common"
- ${LUA_LIBRARIES} )
+ "eve-common" "common"
+ "utils"
+ ${GANGSTA_LIBRARIES} ${TINYXML_LIBRARIES}
+ ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES}
+ ${PROJECT_STANDARD_LIBRARIES} )
INSTALL( TARGETS "${TARGET_NAME}"
RUNTIME DESTINATION "bin" )
INSTALL( FILES "${TARGET_UTILS_DIR}/eve-server.xml"
DESTINATION "etc" )
+
+######################
+# Export directories #
+######################
+SET( ${TARGET_NAME}_INCLUDE_DIR "${TARGET_INCLUDE_DIR}" PARENT_SCOPE )
View
0  ...server/infogathering/InfoGatheringMgr.cpp → ...server/infogathering/infoGatheringMgr.cpp
File renamed without changes
View
5 src/eve-server/mining/Asteroid.cpp
@@ -1,3 +1,8 @@
+
+#include "EVEServerPCH.h"
+
+using namespace Destiny;
+
/*
------------------------------------------------------------------------------------
LICENSE:
View
9 src/eve-server/ship/DestinyManager.cpp
@@ -936,8 +936,7 @@ void DestinyManager::Follow(SystemEntity *who, double distance, bool update) {
SendSingleDestinyUpdate(&tmp); //consumed
}
- sLog.Debug( "DestinyManager::GotoDirection()", "SystemEntity '%s' following SystemEntity '%s' at velocity %f",
- m_self->GetName(), who->GetName(), m_velocity.length() );
+ sLog.Debug( "DestinyManager::GotoDirection()", "SystemEntity '%s' following SystemEntity '%s' at velocity %f", this->m_self->GetName(), who->GetName(), m_velocity );
// Forcibly set Speed since it doesn't get updated when Following upon Undock from stations:
SetSpeedFraction( m_activeSpeedFraction, true );
@@ -1101,8 +1100,7 @@ void DestinyManager::AlignTo(const GPoint &direction, bool update) {
SendSingleDestinyUpdate(&tmp); //consumed
}
- sLog.Debug( "DestinyManager::GotoDirection()", "SystemEntity '%s' vectoring to (%f,%f,%f) at velocity %f",
- m_self->GetName(), direction.x, direction.y, direction.z, m_velocity.length() );
+ sLog.Debug( "DestinyManager::GotoDirection()", "SystemEntity '%s' vectoring to (%f,%f,%f) at velocity %f", this->m_self->GetName(), direction.x, direction.y, direction.z, m_velocity );
}
void DestinyManager::GotoDirection(const GPoint &direction, bool update) {
@@ -1121,8 +1119,7 @@ void DestinyManager::GotoDirection(const GPoint &direction, bool update) {
//Clear any pending docking operation since the user set a new course:
m_self->CastToClient()->SetPendingDockOperation( false );
- sLog.Debug( "DestinyManager::GotoDirection()", "SystemEntity '%s' vectoring to (%f,%f,%f) at velocity %f",
- m_self->GetName(), direction.x, direction.y, direction.z, m_velocity.length() );
+ sLog.Debug( "DestinyManager::GotoDirection()", "SystemEntity '%s' vectoring to (%f,%f,%f) at velocity %f", this->m_self->GetName(), direction.x, direction.y, direction.z, m_velocity );
if(update) {
DoDestiny_CmdGotoDirection du;
View
2  src/eve-server/system/BubbleManager.cpp
@@ -53,7 +53,7 @@ void BubbleManager::Process() {
std::vector<SystemEntity *> wanderers;
{
- std::vector<SystemBubble *>::iterator cur, end;
+ std::vector<SystemBubble *>::const_iterator cur, end;
cur = m_bubbles.begin();
end = m_bubbles.end();
for(; cur != end; ++cur) {
View
32 src/eve-tool/CMakeLists.txt
@@ -11,15 +11,6 @@ SET( TARGET_NAME "eve-tool" )
SET( TARGET_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/include/${TARGET_NAME}" )
SET( TARGET_SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/${TARGET_NAME}" )
-SET( TARGET_INCLUDE_DIRS
- ${eve-common_INCLUDE_DIRS}
- "${TARGET_INCLUDE_DIR}" )
-
-# Export directories
-SET( ${TARGET_NAME}_INCLUDE_DIRS
- ${TARGET_INCLUDE_DIRS}
- PARENT_SCOPE )
-
#########
# Files #
#########
@@ -33,7 +24,14 @@ SET( SOURCE
########################
# Setup the executable #
########################
-INCLUDE_DIRECTORIES( ${TARGET_INCLUDE_DIRS} )
+INCLUDE_DIRECTORIES( "${MYSQL_INCLUDE_DIR}" )
+
+INCLUDE_DIRECTORIES( "${utils_INCLUDE_DIR}" )
+
+INCLUDE_DIRECTORIES( "${common_INCLUDE_DIR}" )
+INCLUDE_DIRECTORIES( "${eve-common_INCLUDE_DIR}" )
+INCLUDE_DIRECTORIES( "${eve-common_PACKETS_DIR}" )
+INCLUDE_DIRECTORIES( "${TARGET_INCLUDE_DIR}" )
SOURCE_GROUP( "include" FILES ${INCLUDE} )
SOURCE_GROUP( "src" FILES ${SOURCE} )
@@ -42,10 +40,18 @@ ADD_EXECUTABLE( "${TARGET_NAME}"
${INCLUDE} ${SOURCE} )
TARGET_BUILD_PCH( "${TARGET_NAME}"
- "${TARGET_INCLUDE_DIR}/EVEToolPCH.h"
- "${TARGET_SOURCE_DIR}/main.cpp" )
+ "EVEToolPCH.h"
+ "main.cpp" )
TARGET_LINK_LIBRARIES( "${TARGET_NAME}"
- "eve-common" )
+ "eve-common" "common"
+ "utils"
+ ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES}
+ ${PROJECT_STANDARD_LIBRARIES} )
INSTALL( TARGETS "${TARGET_NAME}"
RUNTIME DESTINATION "bin" )
+
+######################
+# Export directories #
+######################
+SET( ${TARGET_NAME}_INCLUDE_DIR "${TARGET_INCLUDE_DIR}" PARENT_SCOPE )
View
27 src/xmlpktgen/CMakeLists.txt
@@ -11,15 +11,6 @@ SET( TARGET_NAME "xmlpktgen" )
SET( TARGET_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/include/${TARGET_NAME}" )
SET( TARGET_SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/${TARGET_NAME}" )
-SET( TARGET_INCLUDE_DIRS
- ${common_INCLUDE_DIRS}
- "${TARGET_INCLUDE_DIR}" )
-
-# Export directories
-SET( ${TARGET_NAME}_INCLUDE_DIRS
- ${TARGET_INCLUDE_DIRS}
- PARENT_SCOPE )
-
#########
# Files #
#########
@@ -49,7 +40,10 @@ SET( SOURCE
########################
# Setup the executable #
########################
-INCLUDE_DIRECTORIES( ${TARGET_INCLUDE_DIRS} )
+INCLUDE_DIRECTORIES( "${TINYXML_INCLUDE_DIR}" )
+
+INCLUDE_DIRECTORIES( "${common_INCLUDE_DIR}" )
+INCLUDE_DIRECTORIES( "${TARGET_INCLUDE_DIR}" )
SOURCE_GROUP( "include" FILES ${INCLUDE} )
SOURCE_GROUP( "src" FILES ${SOURCE} )
@@ -58,7 +52,14 @@ ADD_EXECUTABLE( "${TARGET_NAME}"
${INCLUDE} ${SOURCE} )
TARGET_BUILD_PCH( "${TARGET_NAME}"
- "${TARGET_INCLUDE_DIR}/XMLPktGenPCH.h"
- "${TARGET_SOURCE_DIR}/main.cpp" )
+ "XMLPktGenPCH.h"
+ "main.cpp" )
TARGET_LINK_LIBRARIES( "${TARGET_NAME}"
- "common" )
+ "common"
+ ${TINYXML_LIBRARIES}
+ ${PROJECT_STANDARD_LIBRARIES} )
+
+######################
+# Export directories #
+######################
+SET( ${TARGET_NAME}_INCLUDE_DIR "${TARGET_INCLUDE_DIR}" PARENT_SCOPE )
Please sign in to comment.
Something went wrong with that request. Please try again.