Skip to content
This repository was archived by the owner on Jul 8, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitexternals
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# -*- mode: cmake -*-
# CMake/common https://github.com/Eyescale/CMake.git 7f24457
# CMake/common https://github.com/Eyescale/CMake.git 27f7013
2 changes: 1 addition & 1 deletion .gitsubprojects
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- mode: cmake -*-
git_subproject(zeq https://github.com/HBPVis/zeq.git d31749c)
git_subproject(zeq https://github.com/HBPVis/zeq.git 46c389d)
git_subproject(FlatBuffers https://github.com/Bluebrain/flatbuffers.git f0ca636)
git_subproject(cppnetlib https://github.com/cpp-netlib/cpp-netlib.git 0.11-devel)
3 changes: 0 additions & 3 deletions CMake/CPackConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
# General CPack configuration
# Info: http://www.itk.org/Wiki/CMake:Component_Install_With_CPack

set(CPACK_PACKAGE_CONTACT "Grigori Chevtchenko <grigori.chevtchenko@epfl.ch>")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
set(CPACK_PACKAGE_LICENSE "Proprietary")

set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost-test-dev")

include(CommonCPack)
4 changes: 2 additions & 2 deletions CMake/GitExternal.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -301,11 +301,11 @@ if(EXISTS ${GIT_EXTERNALS} AND NOT GIT_EXTERNAL_SCRIPT_MODE)
file(WRITE "${GIT_EXTERNAL_SCRIPT}" "
include(\"${CMAKE_CURRENT_LIST_DIR}/GitExternal.cmake\")
execute_process(COMMAND \"${GIT_EXECUTABLE}\" fetch origin -q
WORKING_DIRECTORY \"${DIR}\")
WORKING_DIRECTORY \"${CMAKE_SOURCE_DIR}/${DIR}\")
execute_process(
COMMAND \"${GIT_EXECUTABLE}\" show-ref --hash=7 refs/remotes/origin/master
OUTPUT_VARIABLE newref OUTPUT_STRIP_TRAILING_WHITESPACE
WORKING_DIRECTORY \"${DIR}\")
WORKING_DIRECTORY \"${CMAKE_SOURCE_DIR}/${DIR}\")
if(newref)
file(APPEND ${GIT_EXTERNALS} \"# ${DIR} ${REPO} \${newref}\\n\")
git_external(${DIR} ${REPO} \${newref})
Expand Down
12 changes: 9 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,15 @@ set(VERSION_MINOR "2")
set(VERSION_PATCH "0")
set(VERSION_ABI 1)

set(RESTBRIDGE_DESCRIPTION "A library that provides a simple way to expose a REST interface in a C++ application")
set(RESTBRIDGE_DESCRIPTION "A library that provides a simple way to expose a
REST interface in a C++ application")
set(RESTBRIDGE_ISSUES_URL "https://github.com/BlueBrain/RESTBridge/issues")
set(RESTBRIDGE_MAINTAINER
"BBP Visualization Team <bbp-open-source@googlegroups.com>")
set(RESTBRIDGE_LICENSE LGPL)

include(Common)

set(COMMON_PROJECT_DOMAIN ch.epfl.bluebrain)
option(CPP-NETLIB_BUILD_SHARED_LIBS "Build cpp-netlib as shared libraries." ON)
option(CPP-NETLIB_BUILD_EXAMPLES "Build the cpp-netlib project examples." OFF)
Expand All @@ -39,8 +47,6 @@ if(APPLE)
list(INSERT CMAKE_PREFIX_PATH 0 /opt/local)
endif()

include(Common)

common_package(Boost REQUIRED COMPONENTS unit_test_framework system thread)
common_package(cppnetlib SYSTEM REQUIRED)
common_package(FlatBuffers REQUIRED)
Expand Down
8 changes: 5 additions & 3 deletions doc/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@ if you find any other issue with this release.

# Changes {#Changes}

## RESTBridge 0.2 (git-master) {#version020}
## RESTBridge 0.2 (09-Nov-2015) {#version020}

* [23](https://github.com/BlueBrain/RESTBridge/pull/23):
Fix vocabulary to return all registered events, not only one
* [43](https://github.com/BlueBrain/RESTBridge/pull/43):
Allow using existing publisher, remove zeroconf-based discovery
* [26](https://github.com/BlueBrain/RESTBridge/pull/26):
RESTBridge can parse command line parameters
* [23](https://github.com/BlueBrain/RESTBridge/pull/23):
Fix vocabulary to return all registered events, not only one

## RESTBridge 0.1 (09-Jul-2015) {#version010}

Expand Down