Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

linux fixes

This commit is contained in:
Frank Celler 2016-10-03 19:22:56 +00:00
parent f83f6a7114
commit 21beb09d08
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arangod/CMakeLists.txt
View File

@ -70,9 +70,18 @@ else ()
set(ROCKSDB_FILES "") set(ROCKSDB_FILES "")
endif () endif ()
if (USE_ENTERPRISE)
set(ENTERPRISE_FILES "")
else ()
set(ENTERPRISE_FILES
Utils/Events.cpp
)
endif ()
add_executable(${BIN_ARANGOD} add_executable(${BIN_ARANGOD}
${ProductVersionFiles} ${ProductVersionFiles}
${ROCKSDB_FILES} ${ROCKSDB_FILES}
${ENTERPRISE_FILES}
Actions/ActionFeature.cpp Actions/ActionFeature.cpp
Actions/RestActionHandler.cpp Actions/RestActionHandler.cpp
Actions/actions.cpp Actions/actions.cpp
@ -301,7 +310,6 @@ add_executable(${BIN_ARANGOD}
Utils/CollectionNameResolver.cpp Utils/CollectionNameResolver.cpp
Utils/Cursor.cpp Utils/Cursor.cpp
Utils/CursorRepository.cpp Utils/CursorRepository.cpp
Utils/Events.cpp
Utils/OperationCursor.cpp Utils/OperationCursor.cpp
Utils/SingleCollectionTransaction.cpp Utils/SingleCollectionTransaction.cpp
Utils/StandaloneTransactionContext.cpp Utils/StandaloneTransactionContext.cpp

2
lib/ProgramOptions/IniFileParser.h
View File

@ -144,6 +144,8 @@ class IniFileParser {
} }
} }
isCommunity ^= isEnterprise;
// all is well // all is well
_options->endPass(); _options->endPass();
return true; return true;