Commit 7f44f3e6 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum

[MERGE]

parents 992a74f4 841b9d54
......@@ -138,6 +138,16 @@ ELSE()
ENDIF()
SET( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -DDEBUG -O2" CACHE STRING "" FORCE )
# Allow injection of other flags
# NOTE: do not set these variables somewhere in cmake. They are intended to be used when calling CMake from the command line.
# Utilize this to append build flags from external systems (like dpkg-buildflags).
SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OW_LD_FLAGS_INJECT}" CACHE STRING "" FORCE )
SET( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OW_LD_FLAGS_INJECT}" CACHE STRING "" FORCE )
SET( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OW_LD_FLAGS_INJECT}" CACHE STRING "" FORCE )
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OW_CXX_FLAGS_INJECT}" CACHE STRING "" FORCE )
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OW_C_FLAGS_INJECT}" CACHE STRING "" FORCE )
ADD_DEFINITIONS( ${OW_CPP_FLAGS_INJECT} )
# -----------------------------------------------------------------------------------------------------------------------------------------------
# Eigen3 specifics
......
......@@ -5,7 +5,7 @@
IF( CMAKE_GENERATOR MATCHES "Visual Studio" )
SET( CMAKE_C_FLAGS "/TC /DWIN32")
ELSE()
SET( CMAKE_C_FLAGS "-w")
SET( CMAKE_C_FLAGS "-w ${OW_C_FLAGS_INJECT}" )
ENDIF()
FILE( GLOB LIBEEP_SRC "libavr/*.c" "libcnt/*.c" "libeep/*.c" )
......@@ -42,3 +42,19 @@ INSTALL( TARGETS ${OWExtEEPName}
NAMELINK_SKIP
COMPONENT "EXT"
)
INSTALL( TARGETS ${OWExtEEPName}
ARCHIVE # NOTE: this is needed on windows
DESTINATION ${OW_LIBRARY_DIR_RELATIVE}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE
LIBRARY # NOTE: this is needed for all the others
DESTINATION ${OW_LIBRARY_DIR_RELATIVE}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE
NAMELINK_ONLY
COMPONENT "EXT_DEV"
)
openwalnut (1.2.5-1.1) unstable; urgency=low
openwalnut (OWPACK_VERSION-1.1) unstable; urgency=low
* Non maintainer upload.
* Fix build failure with GCC 4.7. Closes: #674343
......
......@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 8.0.0),
libbiosig-dev (>= 0.85.0),
libnifti-dev (>= 2.0.0),
zlib1g-dev (>= 1:1.2.3.4.dfsg)
Standards-Version: 3.9.2
Standards-Version: 3.9.3
Homepage: http://www.openwalnut.org
......
Document: openwalnut
Document: libopenwalnut
Title: Openwalnut Developer Documentation
Author: OpenWalnut Community
Abstract: This contains the programmering documentation for OpenWalnut framework API. It documents the OpenWalnut API and allows fast search of classes, functions and other symbols.
......
# The modules package does not provide shared libs in /usr/lib but an ldconfig call is added to postrm and postinst.
openwalnut-modules: postinst-has-useless-call-to-ldconfig
openwalnut-modules: postrm-has-useless-call-to-ldconfig
# Although the hardening options are enabled and verified to be active during compilation, lintian complains about missing hardening options.
openwalnut-modules: hardening-no-fortify-functions
openwalnut-modules: hardening-no-stackprotector
Document: openwalnut
Document: openwalnut-qt4
Title: Openwalnut Online Help
Author: OpenWalnut Community
Abstract: This is the online help available in OpenWalnut.
......
......@@ -13,7 +13,7 @@ override_dh_auto_build:
# Invoke standard build mechanism.
dh_auto_build
# Enable this if you have a multi-core machine and are debugging the debian packages. Disable again for upload.
#dh_auto_build -- -j10
# dh_auto_build -- -j16
# build the core api documentation too
dh_auto_build -- core_devdoc
......@@ -32,7 +32,11 @@ override_dh_auto_configure:
-DOW_MODULE_TOOLBOX_EEG=ON\
-DOW_MODULE_TOOLBOX_IO=ON\
-DOW_MODULE_TOOLBOX_IMAGEPROCESSING=ON\
-DOW_MODULE_TOOLBOX_OTHERS=ON
-DOW_MODULE_TOOLBOX_OTHERS=ON\
-DOW_C_FLAGS_INJECT="$(shell dpkg-buildflags --get CFLAGS)"\
-DOW_CXX_FLAGS_INJECT="$(shell dpkg-buildflags --get CXXFLAGS)"\
-DOW_LD_FLAGS_INJECT="$(shell dpkg-buildflags --get LDFLAGS)"\
-DOW_CPP_FLAGS_INJECT="$(shell dpkg-buildflags --get CPPFLAGS)"
override_dh_auto_install:
# libopenwalnut1
......@@ -40,6 +44,7 @@ override_dh_auto_install:
cmake -DCOMPONENT=EXT -DCMAKE_INSTALL_PREFIX=debian/libopenwalnut1/usr -P build/cmake_install.cmake
# libopenwalnut1-dev
cmake -DCOMPONENT=CORE_DEV -DCMAKE_INSTALL_PREFIX=debian/libopenwalnut1-dev/usr -P build/cmake_install.cmake
cmake -DCOMPONENT=EXT_DEV -DCMAKE_INSTALL_PREFIX=debian/libopenwalnut1-dev/usr -P build/cmake_install.cmake
# libopenwalnut1-doc
# Use jquery from Debian package, so prune shipped one. Taken from https://github.com/neurodebian/statsmodels/tree/debian/debian
-rm ./doc/core/html/jquery.js
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment