From daccfd9c6e7e6644dae92057cf2c52f5834377a1 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Tue, 10 Dec 2013 22:43:21 +0000 Subject: more cmake changes --- src/Bindings/CMakeLists.txt | 7 +++++++ src/CMakeLists.txt | 8 ++++---- src/OSSupport/CMakeLists.txt | 6 ++++-- 3 files changed, 15 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt index 42a6f205f..f2c2fa3ab 100644 --- a/src/Bindings/CMakeLists.txt +++ b/src/Bindings/CMakeLists.txt @@ -4,4 +4,11 @@ project (MCServer) 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) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6cc97d971..a5b1fab63 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -21,10 +21,10 @@ add_subdirectory(Mobs) add_subdirectory(Entities) add_subdirectory(Simulator) -set(SOURCE main Root MCLogger Authenticator StringUtils Server DeadlockDetect WebAdmin GroupManager) -set(SOURCE ${SOURCE} CraftingRecipes FurnaceRecipe MonsterConfig World CommandOutput RCONServer) -set(SOURCE ${SOURCE} Log ClientHandle ChatColor Group Enchantments MonsterConfig ChunkMap ChunkSender) -set(SOURCE ${SOURCE} LightingThread MobCensus MobSpawner MobProximityCounter Noise) +file(GLOB SOURCE + "*.h" + "*.cpp" +) add_executable(../MCServer/MCServer ${SOURCE}) diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt index dbf5dcc7a..e559ca681 100644 --- a/src/OSSupport/CMakeLists.txt +++ b/src/OSSupport/CMakeLists.txt @@ -3,7 +3,9 @@ cmake_minimum_required (VERSION 2.6) project (MCServer) include_directories ("${PROJECT_SOURCE_DIR}/../") -set(SOURCE CriticalSection Timer Thread Sleep IsThread Event SocketThreads ListenThread) -set(SOURCE ${SOURCE} BlockingTCPLink Socket File) +file(GLOB SOURCE + "*.h" + "*.cpp" +) add_library(OSSupport ${SOURCE}) -- cgit v1.2.3