diff --git a/CMakeLists.txt b/CMakeLists.txt index a1b60619f..a7897be92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,77 +18,6 @@ IF(NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE) ENDIF(NOT CMAKE_BUILD_TYPE) -SET(VLD_FOUND FALSE) - -## VLD works only in Microsoft Visual Studio on Windows: -IF(WIN32) -IF(CMAKE_BUILD_TOOL MATCHES "(msdev|devenv)") - -FIND_PATH(VLD_INCLUDE_DIR vld.h - $ENV{VLD_HOME}/include - $ENV{VLD_HOME} - "$ENV{ProgramFiles}/Microsoft Visual Studio .NET 2003/Vc7/include" - ) -#MESSAGE("VLD_INCLUDE_DIR=${VLD_INCLUDE_DIR}") - -## this is just required for runtim enabling/disabling: -FIND_PATH(VLD_INCLUDE_DIR_API vldapi.h - $ENV{VLD_HOME}/include - $ENV{VLD_HOME} - "$ENV{ProgramFiles}/Microsoft Visual Studio .NET 2003/Vc7/include" -) -#MESSAGE("VLD_INCLUDE_DIR_API=${VLD_INCLUDE_DIR}") - -FIND_LIBRARY(VLD_LIBRARY_VLD - NAMES vld - PATHS - $ENV{VLD_HOME}/lib - $ENV{VLD_HOME} - "$ENV{ProgramFiles}/Microsoft Visual Studio .NET 2003/Vc7/lib" - DOC "Visual Leak Debugger multithreaded library" - ) -#MESSAGE("VLD_LIBRARY_VLD=${VLD_LIBRARY_VLD}") - -FIND_LIBRARY(VLD_LIBRARY_VLDMT - NAMES vldmt - PATHS - $ENV{VLD_HOME}/lib - $ENV{VLD_HOME} - "$ENV{ProgramFiles}/Microsoft Visual Studio .NET 2003/Vc7/lib" - DOC "Visual Leak Debugger multithreaded library" - ) -#MESSAGE("VLD_LIBRARY_VLDMT=${VLD_LIBRARY_VLDMT}") - -FIND_LIBRARY(VLD_LIBRARY_VLDMTDLL - NAMES vldmtdll - PATHS - $ENV{VLD_HOME}/lib - $ENV{VLD_HOME} - "$ENV{ProgramFiles}/Microsoft Visual Studio .NET 2003/Vc7/lib" - DOC "Visual Leak Debugger multithreaded library" - ) -#MESSAGE("VLD_LIBRARY_VLDMTDLL=${VLD_LIBRARY_VLDMTDLL}") - -IF(VLD_INCLUDE_DIR) - IF (VLD_LIBRARY_VLD OR VLD_LIBRARY_VLDMT OR VLD_LIBRARY_VLDMTDLL) - ## do NOT add LIBRARIES because dependencies are handled through pragmas. - SET(VLD_FOUND TRUE) - # MESSAGE("found VLD.") - ENDIF (VLD_LIBRARY_VLD OR VLD_LIBRARY_VLDMT OR VLD_LIBRARY_VLDMTDLL) -ENDIF(VLD_INCLUDE_DIR) - -MARK_AS_ADVANCED( - VLD_INCLUDE_DIR - VLD_INCLUDE_DIR_API - VLD_LIBRARY_VLD - VLD_LIBRARY_VLDMT - VLD_LIBRARY_VLDMTDLL - VLD_LIBRARIES -) - -ENDIF(CMAKE_BUILD_TOOL MATCHES "(msdev|devenv)") -ENDIF(WIN32) - #Add our various windows definitions IF(MSVC OR MINGW) ADD_DEFINITIONS(-D_WINDOWS) @@ -210,7 +139,7 @@ ADD_DEFINITIONS(-DMAP_DIR="./Maps") FIND_PACKAGE(ZLIB REQUIRED) FIND_PACKAGE(MySQL REQUIRED) FIND_PACKAGE(PerlLibs REQUIRED) -INCLUDE_DIRECTORIES("${ZLIB_INCLUDE_DIRS}" "${PERL_INCLUDE_PATH}" "${MySQL_INCLUDE_DIR}" "${VLD_INCLUDE_DIR}") +INCLUDE_DIRECTORIES("${ZLIB_INCLUDE_DIRS}" "${PERL_INCLUDE_PATH}" "${MySQL_INCLUDE_DIR}") IF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS) ADD_SUBDIRECTORY(common)