mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11399] Make CMake a bit more usefull for Win/MSVC

Browse source 
Also make the -DPREFIX work on Win/MSVC

Signed-off-by: Neo2003 <Neo.2003@Hotmail.fr>
This commit is contained in:
Neo2003 2011-04-26 18:48:32 +02:00
parent 82367bbdea
commit e512fc9081
7 changed files with 6899 additions and 6886 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CMakeLists.txt
View file

@ -125,7 +125,9 @@ if(CMAKE_INSTALL_PREFIX STREQUAL "/usr/local")
set(CMAKE_INSTALL_PREFIX ${PREFIX_ABSOLUTE} CACHE PATH "Install path prefix." FORCE) set(CMAKE_INSTALL_PREFIX ${PREFIX_ABSOLUTE} CACHE PATH "Install path prefix." FORCE)
endif() endif()
if(PREFIX) if(PREFIX)
string(REGEX REPLACE "^~" "$ENV{HOME}" PREFIX ${PREFIX}) if(!WIN32)
string(REGEX REPLACE "^~" "$ENV{HOME}" PREFIX ${PREFIX})
endif()
get_filename_component(PREFIX_ABSOLUTE ${PREFIX} ABSOLUTE) get_filename_component(PREFIX_ABSOLUTE ${PREFIX} ABSOLUTE)
set(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE PATH "Install path prefix." FORCE) set(CMAKE_INSTALL_PREFIX ${PREFIX} CACHE PATH "Install path prefix." FORCE)
else() else()
@ -285,12 +287,12 @@ if(UNIX)
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wfatal-errors -Wextra") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Wfatal-errors -Wextra")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wfatal-errors -Wextra") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wfatal-errors -Wextra")
elseif(WIN32) elseif(WIN32)
# Disable warnings in Visual Studio 8 and above # Disable warnings in Visual Studio 8 and above and add /MP
if(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7") if(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /MP")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996 /wd4355 /wd4244 /wd4267") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996 /wd4355 /wd4244 /wd4267 /MP")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /MP")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /MP")
endif() endif()
endif() endif()

3
dep/ACE_wrappers/CMakeLists.txt
View file

@ -51,8 +51,7 @@ if(WIN32 AND MSVC)
) )
ExternalProject_Add_Step(ACE_Project ACE_Build ExternalProject_Add_Step(ACE_Project ACE_Build
DEPENDEES ACE_Upgrade DEPENDEES ACE_Upgrade
COMMAND ${ACE_BUILD_TOOL} <SOURCE_DIR>\\ace\\ace_vc8.sln /build Debug|${ACE_CONFIGURATION} COMMAND ${ACE_BUILD_TOOL} <SOURCE_DIR>\\ace\\ace_vc8.sln /project ACE /build ${CMAKE_BUILD_TYPE}|${ACE_CONFIGURATION}
COMMAND ${ACE_BUILD_TOOL} <SOURCE_DIR>\\ace\\ace_vc8.sln /build Release|${ACE_CONFIGURATION}
ALWAYS 0 ALWAYS 0
) )
elseif(UNIX) elseif(UNIX)

13742
dep/ACE_wrappers/ace/ACE_vc8.vcproj
View file

File diff suppressed because it is too large Load diff

4
dep/tbb/CMakeLists.txt
View file

@ -48,8 +48,8 @@ if(WIN32 AND MSVC)
) )
ExternalProject_Add_Step(TBB_Project TBB_Build ExternalProject_Add_Step(TBB_Project TBB_Build
DEPENDEES TBB_Upgrade DEPENDEES TBB_Upgrade
COMMAND ${TBB_BUILD_TOOL} ${TBB_SOURCE}\\makefile.sln /build Debug|${TBB_CONFIGURATION} COMMAND ${TBB_BUILD_TOOL} ${TBB_SOURCE}\\makefile.sln /project tbb /build ${CMAKE_BUILD_TYPE}|${TBB_CONFIGURATION}
COMMAND ${TBB_BUILD_TOOL} ${TBB_SOURCE}\\makefile.sln /build Release|${TBB_CONFIGURATION} COMMAND ${TBB_BUILD_TOOL} ${TBB_SOURCE}\\makefile.sln /project tbbmalloc /build ${CMAKE_BUILD_TYPE}|${TBB_CONFIGURATION}
ALWAYS 0 ALWAYS 0
) )
elseif(UNIX) elseif(UNIX)

10
src/mangosd/CMakeLists.txt
View file

@ -19,6 +19,12 @@
set(EXECUTABLE_NAME mangosd) set(EXECUTABLE_NAME mangosd)
file(GLOB_RECURSE EXECUTABLE_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h) file(GLOB_RECURSE EXECUTABLE_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h)
if(WIN32)
list(APPEND EXECUTABLE_SRCS
mangosd.rc
)
endif()
include_directories( include_directories(
${CMAKE_SOURCE_DIR}/src/shared ${CMAKE_SOURCE_DIR}/src/shared
${CMAKE_SOURCE_DIR}/dep/include/gsoap ${CMAKE_SOURCE_DIR}/dep/include/gsoap
@ -59,9 +65,7 @@ if(WIN32)
debug ${OPENSSL_DEBUG_LIBRARIES} debug ${OPENSSL_DEBUG_LIBRARIES}
) )
if(PLATFORM MATCHES X86) if(PLATFORM MATCHES X86)
target_link_libraries(${EXECUTABLE_NAME} target_link_libraries(${EXECUTABLE_NAME})
debug ${WIN_DEBUGLIBS}
)
endif() endif()
endif() endif()

10
src/realmd/CMakeLists.txt
View file

@ -19,6 +19,12 @@
set(EXECUTABLE_NAME realmd) set(EXECUTABLE_NAME realmd)
file(GLOB_RECURSE EXECUTABLE_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h) file(GLOB_RECURSE EXECUTABLE_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.h)
if(WIN32)
list(APPEND EXECUTABLE_SRCS
realmd.rc
)
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
@ -52,9 +58,7 @@ if(WIN32)
debug ${OPENSSL_DEBUG_LIBRARIES} debug ${OPENSSL_DEBUG_LIBRARIES}
) )
if(PLATFORM MATCHES X86) if(PLATFORM MATCHES X86)
target_link_libraries(${EXECUTABLE_NAME} target_link_libraries(${EXECUTABLE_NAME})
debug ${WIN_DEBUGLIBS}
)
endif() endif()
endif() endif()

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11398" #define REVISION_NR "11399"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__