Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

tiny-dnn: Install thirdparty headers for consistency

Browse Source
This commit is contained in:
Alexey Pavlov
2017-09-17 21:53:38 +03:00
parent 3e4e38473e
commit 6653515809
2 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mingw-w64-tiny-dnn/PKGBUILD
View File

@@ -4,7 +4,7 @@ _realname=tiny-dnn
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.0.0a3
pkgrel=1
pkgrel=2
pkgdesc="C++14 implementation of deep learning (mingw-w64)"
arch=('any')
license=('BSD3')
@@ -18,7 +18,7 @@ source=(${_realname}-${pkgver}.tar.gz::https://github.com/tiny-dnn/tiny-dnn/arch
build-fixes.patch)
options=('!strip' 'staticlibs')
sha256sums=('e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5175846505aa18b'
'094687da7db3addbb03611ccb20013b271e28f3ba87c216c7068a0a60b69d7b2')
'4b0660757ca19127dff48796d15e2c072ea03417700fbf7a43babd71ef6e6602')
prepare() {
cd ${_realname}-${pkgver}

50
mingw-w64-tiny-dnn/build-fixes.patch
View File

@@ -1,20 +1,3 @@
diff -Naur tiny-dnn-1.0.0a3-orig/CMakeLists.txt tiny-dnn-1.0.0a3/CMakeLists.txt
--- tiny-dnn-1.0.0a3-orig/CMakeLists.txt 2016-11-28 18:34:16.000000000 +0300
+++ tiny-dnn-1.0.0a3/CMakeLists.txt 2017-09-06 07:32:34.429543300 +0300
@@ -276,11 +276,11 @@
# Set up install directories. INCLUDE_INSTALL_DIR and
# CMAKECONFIG_INSTALL_DIR must not be absolute paths.
-if(WIN32)
+if(MSVC)
set(include_install_dir Include)
set(include_install_dir_full Include)
set(config_install_dir CMake)
-elseif(UNIX)
+elseif(UNIX OR MINGW)
set(include_install_dir include)
set(include_install_dir_postfix "${project_library_target_name}")
set(include_install_dir_full "${include_install_dir}/${include_install_dir_postfix}")
diff -Naur tiny-dnn-1.0.0a3-orig/tiny_dnn/io/caffe/caffe.proto tiny-dnn-1.0.0a3/tiny_dnn/io/caffe/caffe.proto
--- tiny-dnn-1.0.0a3-orig/tiny_dnn/io/caffe/caffe.proto 2017-09-06 07:50:17.461345300 +0300
+++ tiny-dnn-1.0.0a3/tiny_dnn/io/caffe/caffe.proto 2017-09-06 07:50:41.323710100 +0300
@@ -38,3 +21,36 @@ diff -Naur tiny-dnn-1.0.0a3-orig/tiny_dnn/io/caffe/caffe.proto tiny-dnn-1.0.0a3/
PERMISSIVE = 1;
}
repeated float blobs_lr = 7;
diff -Naur tiny-dnn-1.0.0a3-orig/CMakeLists.txt tiny-dnn-1.0.0a3/CMakeLists.txt
--- tiny-dnn-1.0.0a3-orig/CMakeLists.txt 2017-09-16 23:05:43.942939500 +0300
+++ tiny-dnn-1.0.0a3/CMakeLists.txt 2017-09-16 23:04:20.022139500 +0300
@@ -276,14 +276,14 @@
# Set up install directories. INCLUDE_INSTALL_DIR and
# CMAKECONFIG_INSTALL_DIR must not be absolute paths.
-if(WIN32)
+if(MSVC)
set(include_install_dir Include)
set(include_install_dir_full Include)
set(config_install_dir CMake)
-elseif(UNIX)
- set(include_install_dir include)
+elseif(UNIX OR MINGW)
+ set(include_install_dir include/${project_library_target_name})
set(include_install_dir_postfix "${project_library_target_name}")
- set(include_install_dir_full "${include_install_dir}/${include_install_dir_postfix}")
+ set(include_install_dir_full "${include_install_dir}/${project_library_target_name}/${include_install_dir_postfix}")
set(config_install_dir share/${PACKAGE_NAME})
else()
@@ -342,6 +342,10 @@
install(DIRECTORY ${PROJECT_SOURCE_DIR}/${project_library_target_name}
DESTINATION ${include_install_dir})
+# Install third party headers
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/third_party
+ DESTINATION ${include_install_dir})
+
# Check if protobuf available
include(cmake/protoc.cmake)