mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 16:17:46 +00:00
Code Activity

Merge pull request #59 from Minoost/cmake

Browse source 
Remove VS2015 boost compiler from CMake
This commit is contained in:
SapphireMordred 2017-08-17 17:30:33 +02:00 • committed by GitHub
commit 99b48050ff
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -2,16 +2,14 @@ cmake_minimum_required(VERSION 2.6)
project (Sapphire) project (Sapphire)
set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin) set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/bin)
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}) set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include) set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
# boost stuff # boost stuff
if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC") # set(Boost_DEBUG 1)
set(Boost_COMPILER "-vc140")
endif()
if(NOT SAPPHIRE_BOOST_VER) if(NOT SAPPHIRE_BOOST_VER)
set(SAPPHIRE_BOOST_VER 1.60.0) set(SAPPHIRE_BOOST_VER 1.60.0)
@ -20,6 +18,6 @@ set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_60_0)
include_directories("${PROJECT_INCLUDE_DIR}") include_directories("${PROJECT_INCLUDE_DIR}")
include_directories("${PROJECT_SOURCE_DIR}") include_directories("${PROJECT_SOURCE_DIR}")
add_subdirectory("src/servers") add_subdirectory("src/servers")
add_subdirectory("src/libraries/sapphire/datReader") add_subdirectory("src/libraries/sapphire/datReader")