summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias@gamezock.de>2009-08-20 02:01:26 +0200
committerMatthias Schiffer <matthias@gamezock.de>2009-08-20 02:01:26 +0200
commit36792c7b489c984db95e2384660f1933c0498db0 (patch)
treeb64978461d3b110283234db3e63d2bcb8d7f8005
parent28f25233eeadad268e09d873429bd6f484d0bc86 (diff)
downloadmad-36792c7b489c984db95e2384660f1933c0498db0.tar
mad-36792c7b489c984db95e2384660f1933c0498db0.zip
CMake: Ein paar Fixes für MacOS X
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/Client/CMakeLists.txt2
-rw-r--r--src/Common/CMakeLists.txt2
-rw-r--r--src/Daemon/CMakeLists.txt2
-rw-r--r--src/Server/CMakeLists.txt2
-rw-r--r--src/modules/CMakeLists.txt2
-rw-r--r--src/modules/FileLogger/CMakeLists.txt2
-rw-r--r--src/modules/SystemBackendPosix/CMakeLists.txt1
-rw-r--r--src/modules/SystemBackendProc/CMakeLists.txt1
-rw-r--r--src/modules/UserConfigBackendHome/CMakeLists.txt2
-rw-r--r--src/modules/UserDBBackendMysql/CMakeLists.txt2
11 files changed, 13 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 24affaf..72ed248 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,10 +19,10 @@ add_subdirectory(modules)
include_directories(${INCLUDES})
add_executable(mad-server mad-server.cpp)
-target_link_libraries(mad-server Server)
+target_link_libraries(mad-server Server Common Net Core)
add_executable(mad mad.cpp)
-target_link_libraries(mad Daemon)
+target_link_libraries(mad Daemon Common Net Core)
add_executable(madc madc.cpp)
-target_link_libraries(madc Client ${READLINE_LIBRARY})
+target_link_libraries(madc Client Common Net Core ${READLINE_LIBRARY})
diff --git a/src/Client/CMakeLists.txt b/src/Client/CMakeLists.txt
index fcd6f6b..601ada8 100644
--- a/src/Client/CMakeLists.txt
+++ b/src/Client/CMakeLists.txt
@@ -15,4 +15,4 @@ mad_library(Client
SystemCommands.cpp SystemCommands.h
UserCommands.cpp UserCommands.h
)
-target_link_libraries(Client Common)
+target_link_libraries(Client Common Net Core)
diff --git a/src/Common/CMakeLists.txt b/src/Common/CMakeLists.txt
index 016bf78..4ddcd07 100644
--- a/src/Common/CMakeLists.txt
+++ b/src/Common/CMakeLists.txt
@@ -38,4 +38,4 @@ mad_library(Common
UserManager.cpp UserManager.h
XmlPacket.cpp XmlPacket.h
)
-target_link_libraries(Common Net modules ${LIBXML2_LIBRARIES} ${DL_LIBRARY})
+target_link_libraries(Common Net Core modules ${LIBXML2_LIBRARIES} ${DL_LIBRARY})
diff --git a/src/Daemon/CMakeLists.txt b/src/Daemon/CMakeLists.txt
index 3972429..cbeafd2 100644
--- a/src/Daemon/CMakeLists.txt
+++ b/src/Daemon/CMakeLists.txt
@@ -11,4 +11,4 @@ mad_library(Daemon
Application.cpp Application.h
)
-target_link_libraries(Daemon Common)
+target_link_libraries(Daemon Common Net Core)
diff --git a/src/Server/CMakeLists.txt b/src/Server/CMakeLists.txt
index b9bffa1..80cf25d 100644
--- a/src/Server/CMakeLists.txt
+++ b/src/Server/CMakeLists.txt
@@ -13,4 +13,4 @@ mad_library(Server
Application.cpp Application.h
ConnectionManager.cpp ConnectionManager.h
)
-target_link_libraries(Server Common)
+target_link_libraries(Server Common Net Core)
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 13ad209..7e11214 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -29,7 +29,7 @@ macro(mad_module_libraries name)
string(TOUPPER ${name} upper_name)
if(WITH_${upper_name})
- target_link_libraries(${name} ${ARGN})
+ target_link_libraries(${name} Common Net Core ${ARGN})
endif(WITH_${upper_name})
endmacro(mad_module_libraries)
diff --git a/src/modules/FileLogger/CMakeLists.txt b/src/modules/FileLogger/CMakeLists.txt
index ac1deab..c96f078 100644
--- a/src/modules/FileLogger/CMakeLists.txt
+++ b/src/modules/FileLogger/CMakeLists.txt
@@ -4,4 +4,4 @@ mad_module(FileLogger
FileLogger.h
Module.cpp Module.h
)
-mad_module_libraries(FileLogger Common)
+mad_module_libraries(FileLogger)
diff --git a/src/modules/SystemBackendPosix/CMakeLists.txt b/src/modules/SystemBackendPosix/CMakeLists.txt
index 0cd493d..df929d7 100644
--- a/src/modules/SystemBackendPosix/CMakeLists.txt
+++ b/src/modules/SystemBackendPosix/CMakeLists.txt
@@ -4,3 +4,4 @@ mad_module(SystemBackendPosix
Module.cpp Module.h
SystemBackendPosix.cpp SystemBackendPosix.h
)
+mad_module_libraries(SystemBackendPosix)
diff --git a/src/modules/SystemBackendProc/CMakeLists.txt b/src/modules/SystemBackendProc/CMakeLists.txt
index 5341f89..caff9cc 100644
--- a/src/modules/SystemBackendProc/CMakeLists.txt
+++ b/src/modules/SystemBackendProc/CMakeLists.txt
@@ -4,3 +4,4 @@ mad_module(SystemBackendProc
Module.cpp Module.h
SystemBackendProc.cpp SystemBackendProc.h
)
+mad_module_libraries(SystemBackendProc)
diff --git a/src/modules/UserConfigBackendHome/CMakeLists.txt b/src/modules/UserConfigBackendHome/CMakeLists.txt
index 4f8e224..9d27fce 100644
--- a/src/modules/UserConfigBackendHome/CMakeLists.txt
+++ b/src/modules/UserConfigBackendHome/CMakeLists.txt
@@ -5,4 +5,4 @@ mad_module(UserConfigBackendHome
UserConfigBackendHome.cpp UserConfigBackendHome.h
)
-mad_module_libraries(UserConfigBackendHome) \ No newline at end of file
+mad_module_libraries(UserConfigBackendHome)
diff --git a/src/modules/UserDBBackendMysql/CMakeLists.txt b/src/modules/UserDBBackendMysql/CMakeLists.txt
index 80b83d1..a505c8a 100644
--- a/src/modules/UserDBBackendMysql/CMakeLists.txt
+++ b/src/modules/UserDBBackendMysql/CMakeLists.txt
@@ -4,4 +4,4 @@ mad_module(UserDBBackendMysql
Module.cpp Module.h
UserDBBackendMysql.cpp UserDBBackendMysql.h
)
-mad_module_libraries(UserDBBackendMysql ${MYSQL_LIBRARIES}) \ No newline at end of file
+mad_module_libraries(UserDBBackendMysql ${MYSQL_LIBRARIES})