Removed the custom /deploy/server cmake config

This commit is contained in:
Xackery 2018-03-11 14:20:50 -07:00
parent e72f1e855f
commit f990292660

View File

@ -52,8 +52,6 @@ IF(MSVC OR MINGW)
ENDIF(CMAKE_CL_64)
ENDIF(MSVC OR MINGW)
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/deploy/server")
# include dirs are universal
SET(NATS_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/nats")
SET(PROTOBUF_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/protobuf")
@ -62,14 +60,7 @@ SET(NATS_INCLUDE_DIR "${NATS_ROOT}/include")
SET(PROTOBUF_INCLUDE_DIR "${PROTOBUF_ROOT}/include")
IF(MSVC)
foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_CURRENT_SOURCE_DIR}/deploy/server" )
set( CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_CURRENT_SOURCE_DIR}/deploy/server" )
set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_CURRENT_SOURCE_DIR}/deploy/server" )
endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
#Set our default locations for zlib/mysql based on x86/x64
IF(CMAKE_CL_64)