Skip to content

Commit

Permalink
2.0.0 Release preparation (#945)
Browse files Browse the repository at this point in the history
* Bumped Pillow and websockets version. (#922)

* Code cleanup (#923)

* Brayns 278 add mock requests in python tests (#924)

* Brayns 285 fix logic issue in quanta jpeg stream (#925)

* Brayns 286 fix python image method (#928)

* Brayns 287 fix python entrypoint methods with one of schema (#929)

* Loaders & CircuitExplorer refactoring (#927)

* Fixed some typo's (#930)

* Update AUTHORS.txt (#931)

* Brayns 258 create a proper logging system for brayns (#932)

* Frame export improvement and static global objects removal: (#933)

* Removes CMake/common dependency from build system (#934)

* Removed VRPN plugin and deps. (#935)

* Brayns 295 rename brayns json macros to a more appropriate name (#936)

* Fixes segfault due to global const std::strings (#939)

* Map and unmap framebuffer added. (#940)

* Fix entry points variable naming (#941)

* Brayns 300 replace free image (#942)

* Brayns 308 Code restructure (#943)

* Brayns 315 2.0.0 release preparation (#944)
  • Loading branch information
NadirRoGue committed Dec 15, 2021
1 parent 56f6646 commit 0133aae
Show file tree
Hide file tree
Showing 1,063 changed files with 34,100 additions and 53,633 deletions.
8 changes: 0 additions & 8 deletions .github_changelog_generator

This file was deleted.

4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ Build/
build/
debug/
release/
Deflect/
MVDTool/
HighFive/
plugins/extensions/usecases/
CMakeFiles
.DS_Store
*~
Expand Down
32 changes: 0 additions & 32 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,32 +0,0 @@
[submodule "async++"]
path = deps/async++
url = https://github.com/Amanieu/asyncplusplus.git
[submodule "perceptualdiff"]
path = deps/perceptualdiff
url = https://github.com/myint/perceptualdiff.git
[submodule "deps/glm"]
path = deps/glm
url = https://github.com/g-truc/glm.git
[submodule "deps/glfw"]
path = deps/glfw
url = https://github.com/glfw/glfw.git
[submodule "deps/imgui"]
path = deps/imgui
url = https://github.com/ocornut/imgui.git
[submodule "CMake/common"]
path = CMake/common
url = https://github.com/BlueBrain/CMake.git
branch = brayns_recursive_submodules
[submodule "deps/pbrt-v2"]
path = deps/pbrt-v2
url = https://github.com/BlueBrain/pbrt-v2
branch = brayns_integration
[submodule "deps/Brion"]
path = deps/Brion
url = https://github.com/BlueBrain/Brion.git
[submodule "deps/pbrt-v3"]
path = deps/pbrt-v3
url = https://github.com/BlueBrain/pbrt-v3
[submodule "deps/poco"]
path = deps/poco
url = https://github.com/pocoproject/poco.git
8 changes: 0 additions & 8 deletions .gitsubprojects

This file was deleted.

2 changes: 0 additions & 2 deletions .lsan_suppressions.txt

This file was deleted.

2 changes: 1 addition & 1 deletion AUTHORS.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Grigori Chevtchenko
Raphael Dumusc
Stefan Eilemann
Expand All @@ -22,3 +21,4 @@ Fabien Petitjean (contributor)
Sebastien Speierer (contributor)
Benoit Tassin (contributor)
Matthias Wolf (contributor)
Robin De Schepper (contributor)
83 changes: 0 additions & 83 deletions CMake/FindFreeImage.cmake

This file was deleted.

221 changes: 221 additions & 0 deletions CMake/FindPoco.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
# FROM https://github.com/astahl/poco-cmake/blob/master/cmake/FindPoco.cmake
#
# - finds the Poco C++ libraries
# This module finds the Applied Informatics Poco libraries.
# It supports the following components:
#
# Util (loaded by default)
# Foundation (loaded by default)
# JSON
# XML
# Zip
# Crypto
# Data
# Net
# NetSSL
# OSP
#
# Usage:
# set(ENV{Poco_DIR} path/to/poco/sdk)
# find_package(Poco REQUIRED OSP Data Crypto)
#
# On completion, the script defines the following variables:
#
# - Compound variables:
# Poco_FOUND
# - true if all requested components were found.
# Poco_LIBRARIES
# - contains release (and debug if available) libraries for all requested components.
# It has the form "optimized LIB1 debug LIBd1 optimized LIB2 ...", ready for use with the target_link_libraries command.
# Poco_INCLUDE_DIRS
# - Contains include directories for all requested components.
#
# - Component variables:
# Poco_Xxx_FOUND
# - Where Xxx is the properly cased component name (eg. 'Util', 'OSP').
# True if a component's library or debug library was found successfully.
# Poco_Xxx_LIBRARY
# - Library for component Xxx.
# Poco_Xxx_LIBRARY_DEBUG
# - debug library for component Xxx
# Poco_Xxx_INCLUDE_DIR
# - include directory for component Xxx
#
# - OSP BundleCreator variables: (i.e. bundle.exe on windows, bundle on unix-likes)
# (is only discovered if OSP is a requested component)
# Poco_OSP_Bundle_EXECUTABLE_FOUND
# - true if the bundle-creator executable was found.
# Poco_OSP_Bundle_EXECUTABLE
# - the path to the bundle-creator executable.
#
# Author: Andreas Stahl andreas.stahl@tu-dresden.de

set(Poco_HINTS
/usr/local
C:/AppliedInformatics
${Poco_DIR}
$ENV{Poco_DIR}
)

if(NOT Poco_ROOT_DIR)
# look for the root directory, first for the source-tree variant
find_path(Poco_ROOT_DIR
NAMES Foundation/include/Poco/Poco.h
HINTS ${Poco_HINTS}
)
if(NOT Poco_ROOT_DIR)
# this means poco may have a different directory structure, maybe it was installed, let's check for that
find_path(Poco_ROOT_DIR
NAMES include/Poco/Poco.h
HINTS ${Poco_HINTS}
)
if(NOT Poco_ROOT_DIR)
# poco was still not found -> Fail
if(Poco_FIND_REQUIRED)
message(FATAL_ERROR "Poco: Could not find Poco install directory")
endif()
if(NOT Poco_FIND_QUIETLY)
message(STATUS "Poco: Could not find Poco install directory")
endif()
return()
else()
# poco was found with the make install directory structure
message(STATUS "Assuming Poco install directory structure at ${Poco_ROOT_DIR}.")
set(Poco_INSTALLED true)
endif()
endif()
endif()

# add dynamic library directory
if(WIN32)
find_path(Poco_RUNTIME_LIBRARY_DIRS
NAMES PocoFoundation.dll
HINTS ${Poco_ROOT_DIR}
PATH_SUFFIXES
bin
lib
)
endif()

# if installed directory structure, set full include dir
if(Poco_INSTALLED)
set(Poco_INCLUDE_DIRS ${Poco_ROOT_DIR}/include/ CACHE PATH "The global include path for Poco")
endif()

# append the default minimum components to the list to find
list(APPEND components
${Poco_FIND_COMPONENTS}
# default components:
"Util"
"Foundation"
)
list(REMOVE_DUPLICATES components) # remove duplicate defaults

foreach( component ${components} )
#if(NOT Poco_${component}_FOUND)

# include directory for the component
if(NOT Poco_${component}_INCLUDE_DIR)
if(component STREQUAL "NetSSL")
set(component_INCLUDE_NAMES
"Poco/Net/NetSSL.h"
)
else()
set(component_INCLUDE_NAMES
"Poco/${component}.h" # e.g. Foundation.h
"Poco/${component}/${component}.h" # e.g. OSP/OSP.h Util/Util.h
)
endif()
find_path(Poco_${component}_INCLUDE_DIR
NAMES
${component_INCLUDE_NAMES}
HINTS
${Poco_ROOT_DIR}
PATH_SUFFIXES
include
${component}/include
)
endif()
if(NOT Poco_${component}_INCLUDE_DIR)
message(FATAL_ERROR "Poco_${component}_INCLUDE_DIR NOT FOUND")
else()
list(APPEND Poco_INCLUDE_DIRS ${Poco_${component}_INCLUDE_DIR})
endif()

# release library
if(NOT Poco_${component}_LIBRARY)
find_library(
Poco_${component}_LIBRARY
NAMES Poco${component}
HINTS ${Poco_ROOT_DIR}
PATH_SUFFIXES
lib
bin
)
if(Poco_${component}_LIBRARY)
message(STATUS "Found Poco ${component}: ${Poco_${component}_LIBRARY}")
endif()
endif()
if(Poco_${component}_LIBRARY)
list(APPEND Poco_LIBRARIES "optimized" ${Poco_${component}_LIBRARY} )
mark_as_advanced(Poco_${component}_LIBRARY)
endif()

# debug library
if(NOT Poco_${component}_LIBRARY_DEBUG)
find_library(
Poco_${component}_LIBRARY_DEBUG
Names Poco${component}d
HINTS ${Poco_ROOT_DIR}
PATH_SUFFIXES
lib
bin
)
if(Poco_${component}_LIBRARY_DEBUG)
message(STATUS "Found Poco ${component} (debug): ${Poco_${component}_LIBRARY_DEBUG}")
endif()
endif(NOT Poco_${component}_LIBRARY_DEBUG)
if(Poco_${component}_LIBRARY_DEBUG)
list(APPEND Poco_LIBRARIES "debug" ${Poco_${component}_LIBRARY_DEBUG})
mark_as_advanced(Poco_${component}_LIBRARY_DEBUG)
endif()

# mark component as found or handle not finding it
if(Poco_${component}_LIBRARY_DEBUG OR Poco_${component}_LIBRARY)
set(Poco_${component}_FOUND TRUE)
elseif(NOT Poco_FIND_QUIETLY)
message(FATAL_ERROR "Could not find Poco component ${component}!")
endif()
endforeach()

if(DEFINED Poco_LIBRARIES)
set(Poco_FOUND true)
endif()

if(${Poco_OSP_FOUND})
# find the osp bundle program
find_program(
Poco_OSP_Bundle_EXECUTABLE
NAMES bundle
HINTS
${Poco_RUNTIME_LIBRARY_DIRS}
${Poco_ROOT_DIR}
PATH_SUFFIXES
bin
OSP/BundleCreator/bin/Darwin/x86_64
OSP/BundleCreator/bin/Darwin/i386
DOC "The executable that bundles OSP packages according to a .bndlspec specification."
)
if(Poco_OSP_Bundle_EXECUTABLE)
set(Poco_OSP_Bundle_EXECUTABLE_FOUND true)
endif()
# include bundle script file
find_file(Poco_OSP_Bundles_file NAMES PocoBundles.cmake HINTS ${CMAKE_MODULE_PATH})
if(${Poco_OSP_Bundles_file})
include(${Poco_OSP_Bundles_file})
endif()
endif()

message(STATUS "Found Poco: ${Poco_LIBRARIES}")


0 comments on commit 0133aae

Please sign in to comment.