Skip to content
This repository has been archived by the owner on Nov 8, 2021. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/kneth/remove-gn-and-adapter' int…
Browse files Browse the repository at this point in the history
…o je/update-dependencies
  • Loading branch information
jedelbo committed Feb 26, 2020
2 parents 0bf8aa3 + c9537de commit 1d415fe
Show file tree
Hide file tree
Showing 12 changed files with 2 additions and 1,882 deletions.
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ if(REALM_CORE_PREFIX AND REALM_ENABLE_SYNC AND NOT REALM_SYNC_PREFIX)
message(FATAL_ERROR "REALM_SYNC_PREFIX must be set when specifying REALM_CORE_PREFIX when REALM_ENABLE_SYNC is set.")
endif()

set(REALM_ENABLE_SERVER OFF CACHE BOOL "Enable the server-only functionality.")
if(REALM_ENABLE_SERVER AND NOT REALM_ENABLE_SYNC)
message(FATAL_ERROR "REALM_ENABLE_SERVER requires REALM_ENABLE_SYNC.")
endif()

include(RealmCore)
use_realm_core("${REALM_ENABLE_SYNC}" "${REALM_CORE_PREFIX}" "${REALM_SYNC_PREFIX}")

Expand Down
12 changes: 0 additions & 12 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,6 @@ if(REALM_ENABLE_SYNC)
list(APPEND INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS})
endif()

if(REALM_ENABLE_SERVER)
list(APPEND HEADERS
server/adapter.hpp
server/admin_realm.hpp
server/global_notifier.hpp)
list(APPEND SOURCES
server/adapter.cpp
server/admin_realm.cpp
server/global_notifier.cpp)
list(APPEND INCLUDE_DIRS ../external/json)
endif()

add_library(realm-object-store STATIC ${SOURCES} ${HEADERS})
set_target_properties(realm-object-store PROPERTIES POSITION_INDEPENDENT_CODE 1)
target_compile_definitions(realm-object-store PRIVATE ${PLATFORM_DEFINES})
Expand Down
Loading

0 comments on commit 1d415fe

Please sign in to comment.