MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add clsocket as a dependency for dfhack lib.

develop
Petr Mrázek 2012-03-13 17:10:46 +01:00
parent eb4757043b
commit 9079ffa4ff
5 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
Unescape Escape View File

@ -7,3 +7,6 @@
[submodule "library/xml"]
path = library/xml
url = git://github.com/peterix/df-structures.git
[submodule "depends/clsocket"]
path = depends/clsocket
url = git://github.com/peterix/clsocket.git

1
CMakeLists.txt
Unescape Escape View File

@ -110,6 +110,7 @@ include_directories(depends/md5)
include_directories(depends/tinyxml)
include_directories(depends/tthread)
include_directories(${ZLIB_INCLUDE_DIRS})
include_directories(depends/clsocket/src)
add_subdirectory(depends)

4
depends/CMakeLists.txt
Unescape Escape View File

@ -4,3 +4,7 @@ add_subdirectory(md5)
add_subdirectory(protobuf)
add_subdirectory(tinyxml)
add_subdirectory(tthread)
# build clsocket static and only as a dependency. Setting those options here overrides its own default settings.
OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." OFF)
OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON)
add_subdirectory(clsocket)

1
depends/clsocket

@ -0,0 +1 @@
Subproject commit 49fa800615a4e5c872164bcb4122030d2ebda9cf

2
library/CMakeLists.txt
Unescape Escape View File

@ -228,7 +228,7 @@ ENDIF()
#effectively disables debug builds...
SET_TARGET_PROPERTIES(dfhack PROPERTIES DEBUG_POSTFIX "-debug" )
TARGET_LINK_LIBRARIES(dfhack protobuf-lite ${PROJECT_LIBS})
TARGET_LINK_LIBRARIES(dfhack protobuf-lite clsocket ${PROJECT_LIBS})
SET_TARGET_PROPERTIES(dfhack PROPERTIES LINK_INTERFACE_LIBRARIES "")
IF(UNIX)