Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Buildsystem/Windows: Adjust the installation-parameters for ACE to install only the compiled runtime binary (.dll-file), not .lib-files etc

Browse Source 
(Thanks to paradox for the heads up)

--HG--
branch : trunk
This commit is contained in:
click
2010-08-12 01:46:47 +02:00
parent eec9212ee4
commit a7c3ac2e19
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@@ -128,13 +128,11 @@ endif()
if( MSVC )
# Set up MSVC to dump files in the <builddir>/bin/<buildtype>/ folder for testing builds before install
# executable binaries (.exe-files)
# executable binaries (.exe-files, and .dll-files on DLL-capable platforms)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
# dynamic linked libraries (.dll)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
# statically linked libraries - commented out as it's not needed - shown here as an example only
# other parts like static libraries etc - commented out as it's not needed - shown here as an example only
#set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
#set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
endif()
@@ -247,8 +245,8 @@ else()
elseif( WIN32 )
# Disable warnings in Visual Studio 8 and above
if(MSVC AND NOT CMAKE_GENERATOR MATCHES "Visual Studio 7")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996 /wd4355 /wd4244 /wd4985 /wd4267 /wd4619")
endif()
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
endif()

2
externals/ace/CMakeLists.txt vendored
View File

@@ -336,4 +336,4 @@ if(PCH)
add_native_precompiled_header(ace ${CMAKE_SOURCE_DIR}/externals/ace/PrecompiledHeaders/WinAcePCH)
endif()
install(TARGETS ace DESTINATION "${CMAKE_INSTALL_PREFIX}")
install(TARGETS ace RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}")