status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #81 from realm/mar/core-always-static 

Always use core as a static library
This commit is contained in:
Mark Rowe 2016-06-01 13:07:25 -07:00
parent 6d22d28fea 332813f7f3
commit e2112f8ca5
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMake/RealmCore.cmake
View File

@ -5,7 +5,9 @@ if(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
endif() endif()
if(SANITIZE_ADDRESS) if(SANITIZE_ADDRESS)
set(MAKEFLAGS "MAKEFLAGS=EXTRA_CFLAGS=-fsanitize=address EXTRA_LDFLAGS=-fsanitize=address") set(EXPORT_MAKEFLAGS export MAKEFLAGS='EXTRA_CFLAGS=-fsanitize=address EXTRA_LDFLAGS=-fsanitize=address')
else()
set(EXPORT_MAKEFLAGS true)
endif() endif()
if (${CMAKE_VERSION} VERSION_GREATER "3.4.0") if (${CMAKE_VERSION} VERSION_GREATER "3.4.0")
@ -68,8 +70,8 @@ function(download_realm_core core_version)
endfunction() endfunction()
macro(define_built_realm_core_target core_directory) macro(define_built_realm_core_target core_directory)
set(core_library_debug ${core_directory}/src/realm/librealm-dbg${CMAKE_SHARED_LIBRARY_SUFFIX}) set(core_library_debug ${core_directory}/src/realm/librealm-dbg.a)
set(core_library_release ${core_directory}/src/realm/librealm${CMAKE_SHARED_LIBRARY_SUFFIX}) set(core_library_release ${core_directory}/src/realm/librealm.a)
set(core_libraries ${core_library_debug} ${core_library_release}) set(core_libraries ${core_library_debug} ${core_library_release})
ExternalProject_Add_Step(realm-core ensure-libraries ExternalProject_Add_Step(realm-core ensure-libraries
@ -78,7 +80,7 @@ macro(define_built_realm_core_target core_directory)
DEPENDEES build DEPENDEES build
) )
add_library(realm SHARED IMPORTED) add_library(realm STATIC IMPORTED)
add_dependencies(realm realm-core) add_dependencies(realm realm-core)
set_property(TARGET realm PROPERTY IMPORTED_LOCATION_DEBUG ${core_library_debug}) set_property(TARGET realm PROPERTY IMPORTED_LOCATION_DEBUG ${core_library_debug})
@ -97,7 +99,7 @@ function(clone_and_build_realm_core branch)
PREFIX ${core_prefix_directory} PREFIX ${core_prefix_directory}
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND export ${MAKEFLAGS} && ${MAKE_EQUAL_MAKE} sh build.sh build BUILD_COMMAND ${EXPORT_MAKEFLAGS} && make -C src/realm librealm.a librealm-dbg.a
INSTALL_COMMAND "" INSTALL_COMMAND ""
${USES_TERMINAL_BUILD} ${USES_TERMINAL_BUILD}
) )
@ -115,7 +117,7 @@ function(build_existing_realm_core core_directory)
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
BUILD_ALWAYS 1 BUILD_ALWAYS 1
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND export ${MAKEFLAGS} && ${MAKE_EQUAL_MAKE} sh build.sh build BUILD_COMMAND ${EXPORT_MAKEFLAGS} && make -C src/realm librealm.a librealm-dbg.a
INSTALL_COMMAND "" INSTALL_COMMAND ""
${USES_TERMINAL_BUILD} ${USES_TERMINAL_BUILD}
) )