flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

more cmake changes

Browse Source
This commit is contained in:
Tycho Bickerstaff 2013-12-10 22:43:21 +00:00
parent 572d48be52
commit daccfd9c6e
7 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -47,3 +47,4 @@ CMakeFiles
Makefile Makefile
cmake_install.cmake cmake_install.cmake
install_mainfest.txt install_mainfest.txt
src/MCServer

3
CMakeLists.txt
View File

@ -4,6 +4,8 @@ project (MCServer)
set(CMAKE_CXX_FLAGS_BAK ${CMAKE_CXX_FLAGS}) set(CMAKE_CXX_FLAGS_BAK ${CMAKE_CXX_FLAGS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
set(CMAKE_BUILD_TYPE_BAK ${CMAKE_BUILD_TYPE})
set(CMAKE_BUILD_TYPE "Release")
add_subdirectory(lib/inifile/) add_subdirectory(lib/inifile/)
add_subdirectory(lib/jsoncpp/) add_subdirectory(lib/jsoncpp/)
@ -11,6 +13,7 @@ add_subdirectory(lib/cryptopp/)
#TODo: set -Wall -Werror -Wextra #TODo: set -Wall -Werror -Wextra
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_BAK}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_BAK}")
set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE_BAK}")
add_subdirectory (src) add_subdirectory (src)

7
lib/cryptopp/CMakeLists.txt
View File

@ -7,4 +7,9 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
endif() endif()
include_directories ("${PROJECT_SOURCE_DIR}/../../src/") include_directories ("${PROJECT_SOURCE_DIR}/../../src/")
add_library(cryptopp rsa integer queue secblock misc randpool pch asn oids modarith nbtheory sha algparam fips140 pssr aes hrtimer cryptlib filters pubkey algebra simple pkcspad iterhash emsa2 eprecomp cpu rijndael) file(GLOB cryptopp_SRC
"*.h"
"*.cpp"
)
add_library(cryptopp ${cryptopp_SRC})

8
lib/jsoncpp/CMakeLists.txt
View File

@ -4,4 +4,10 @@ project (jsoncpp)
include_directories ("${PROJECT_SOURCE_DIR}/../../src/") include_directories ("${PROJECT_SOURCE_DIR}/../../src/")
add_library(jsoncpp src/lib_json/json_value.cpp) file(GLOB SOURCE
"src/lib_json/*.h"
"src/lib_json/*.cpp"
)
add_library(jsoncpp ${SOURCE})

7
src/Bindings/CMakeLists.txt
View File

@ -4,4 +4,11 @@ project (MCServer)
include_directories ("${PROJECT_SOURCE_DIR}/../") include_directories ("${PROJECT_SOURCE_DIR}/../")
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/foo.c
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/bar.c ${CMAKE_CURRENT_BINARY_DIR}/foo.c
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bar.c
)
execute_process(COMMAND "./tolua++.exe" -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg)
add_library(Bindings PluginManager LuaState WebPlugin) add_library(Bindings PluginManager LuaState WebPlugin)

8
src/CMakeLists.txt
View File

@ -21,10 +21,10 @@ add_subdirectory(Mobs)
add_subdirectory(Entities) add_subdirectory(Entities)
add_subdirectory(Simulator) add_subdirectory(Simulator)
set(SOURCE main Root MCLogger Authenticator StringUtils Server DeadlockDetect WebAdmin GroupManager) file(GLOB SOURCE
set(SOURCE ${SOURCE} CraftingRecipes FurnaceRecipe MonsterConfig World CommandOutput RCONServer) "*.h"
set(SOURCE ${SOURCE} Log ClientHandle ChatColor Group Enchantments MonsterConfig ChunkMap ChunkSender) "*.cpp"
set(SOURCE ${SOURCE} LightingThread MobCensus MobSpawner MobProximityCounter Noise) )
add_executable(../MCServer/MCServer ${SOURCE}) add_executable(../MCServer/MCServer ${SOURCE})

6
src/OSSupport/CMakeLists.txt
View File

@ -3,7 +3,9 @@ cmake_minimum_required (VERSION 2.6)
project (MCServer) project (MCServer)
include_directories ("${PROJECT_SOURCE_DIR}/../") include_directories ("${PROJECT_SOURCE_DIR}/../")
set(SOURCE CriticalSection Timer Thread Sleep IsThread Event SocketThreads ListenThread) file(GLOB SOURCE
set(SOURCE ${SOURCE} BlockingTCPLink Socket File) "*.h"
"*.cpp"
)
add_library(OSSupport ${SOURCE}) add_library(OSSupport ${SOURCE})