From b91cfb8765e7dc6941bee464a8046930cd3adff0 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Tue, 10 Dec 2013 18:41:43 +0000 Subject: started work on cmake --- src/OSSupport/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/OSSupport/CMakeLists.txt (limited to 'src/OSSupport') diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt new file mode 100644 index 000000000..af300ef7d --- /dev/null +++ b/src/OSSupport/CMakeLists.txt @@ -0,0 +1,7 @@ + +cmake_minimum_required (VERSION 2.6) +project (MCServer) + +include_directories ("${PROJECT_SOURCE_DIR}/../") + +add_library(OSSupport CriticalSection Timer Thread Sleep IsThread) -- cgit v1.2.3 From 6cdc990884b03395cfddf5afe699a76aa491e7e3 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Tue, 10 Dec 2013 21:39:20 +0000 Subject: more cmake --- src/OSSupport/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/OSSupport') diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt index af300ef7d..dbf5dcc7a 100644 --- a/src/OSSupport/CMakeLists.txt +++ b/src/OSSupport/CMakeLists.txt @@ -3,5 +3,7 @@ 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) -add_library(OSSupport CriticalSection Timer Thread Sleep IsThread) +add_library(OSSupport ${SOURCE}) -- cgit v1.2.3 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/OSSupport/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/OSSupport') 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 From 712f7d5a23015c08c2b838bd0107d21bdbbf5390 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Tue, 10 Dec 2013 22:59:53 +0000 Subject: added tolua++ command and removed stackwalker from build --- src/OSSupport/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'src/OSSupport') diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt index e559ca681..8eeff9d9b 100644 --- a/src/OSSupport/CMakeLists.txt +++ b/src/OSSupport/CMakeLists.txt @@ -4,7 +4,6 @@ project (MCServer) include_directories ("${PROJECT_SOURCE_DIR}/../") file(GLOB SOURCE - "*.h" "*.cpp" ) -- cgit v1.2.3 From e02fbd37ab987080ef4ab5623f59e268ba436713 Mon Sep 17 00:00:00 2001 From: Tycho Bickerstaff Date: Thu, 19 Dec 2013 00:15:30 +0000 Subject: added pthread linking code to OSSupport --- src/OSSupport/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/OSSupport') diff --git a/src/OSSupport/CMakeLists.txt b/src/OSSupport/CMakeLists.txt index 8eeff9d9b..497cd0ba3 100644 --- a/src/OSSupport/CMakeLists.txt +++ b/src/OSSupport/CMakeLists.txt @@ -8,3 +8,7 @@ file(GLOB SOURCE ) add_library(OSSupport ${SOURCE}) + +if(UNIX) + target_link_libraries(OSSupport pthread) +endif() -- cgit v1.2.3