Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix duplicate cutest library conflict and crash

This commit is contained in:
Enno Rehling 2017-01-26 16:05:44 +01:00
parent c72b050a42
commit 2ace44d385
5 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -7,9 +7,6 @@
[submodule "dlmalloc"] [submodule "dlmalloc"]
path = dlmalloc path = dlmalloc
url = https://github.com/ennorehling/dlmalloc.git url = https://github.com/ennorehling/dlmalloc.git
[submodule "cutest"]
path = cutest
url = https://github.com/ennorehling/cutest.git
[submodule "iniparser"] [submodule "iniparser"]
path = iniparser path = iniparser
url = https://github.com/ennorehling/iniparser.git url = https://github.com/ennorehling/iniparser.git

1
CMakeLists.txt
View File

@ -64,7 +64,6 @@ INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/include)
## skip compiler/libc detection and force cmake autoconf: ## skip compiler/libc detection and force cmake autoconf:
#add_definitions(-DUSE_AUTOCONF) #add_definitions(-DUSE_AUTOCONF)
add_subdirectory (cutest)
add_subdirectory (cJSON) add_subdirectory (cJSON)
add_subdirectory (storage) add_subdirectory (storage)
add_subdirectory (iniparser) add_subdirectory (iniparser)

2
clibs

@ -1 +1 @@
Subproject commit daa9de08314a75a4d77ef4e08c713088a96a5ca5 Subproject commit 1052905e08314de8778750d7585474182723111e

1
cutest

@ -1 +0,0 @@
Subproject commit 6e268687dbf6ae55afb63210c3753530d216a622

3
src/CMakeLists.txt
View File

@ -5,7 +5,6 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR})
include_directories (${CJSON_INCLUDE_DIR}) include_directories (${CJSON_INCLUDE_DIR})
include_directories (${CLIBS_INCLUDE_DIR}) include_directories (${CLIBS_INCLUDE_DIR})
include_directories (${STORAGE_INCLUDE_DIR}) include_directories (${STORAGE_INCLUDE_DIR})
include_directories (${CUTEST_INCLUDE_DIR})
include_directories (${LUA_INCLUDE_DIR}) include_directories (${LUA_INCLUDE_DIR})
include_directories (${TOLUA_INCLUDE_DIR}) include_directories (${TOLUA_INCLUDE_DIR})
include_directories (${BSON_INCLUDE_DIR}) include_directories (${BSON_INCLUDE_DIR})
@ -236,7 +235,7 @@ set(TESTS_SRC
add_executable(test_eressea ${TESTS_SRC}) add_executable(test_eressea ${TESTS_SRC})
target_link_libraries(test_eressea target_link_libraries(test_eressea
game game
${CUTEST_LIBRARIES} cutest
${LUA_LIBRARIES} ${LUA_LIBRARIES}
${CLIBS_LIBRARIES} ${CLIBS_LIBRARIES}
${STORAGE_LIBRARIES} ${STORAGE_LIBRARIES}