From 32cd78cbfcfa050eda05d576e341f1ebceccc1b1 Mon Sep 17 00:00:00 2001 From: sirokujira Date: Fri, 23 Mar 2018 09:27:52 +0900 Subject: [PATCH] modified1 --- .travis.yml | 2 +- appveyor.yml | 4 ++++ iOSWrapper/CMakeLists.txt | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4349e52..55c012b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ branches: # - secure: env: global: - - GIT_TAG="librarytest13" + - GIT_TAG="librarytest14" - secure: "kF66P+xYUADGdu9Yjty7DCeUIQbV10BdaSO5MoiiYy0hgItltPXeJdsqlkyFfcH7y4LWTwPfhdTEE5tCez+BL0yYJn9fqRGm2BDO5xaEDOaIEiwh98KpXAEUuhs5hRnZ5kFVEfI6kdTYwrYKTJQABr2PeBXZWWc51lGyC8aC18PAlFr4LC3d3vRa+e3IeSVyiYoScoZlacGe25UU4PVKI2KIsh6n9RUm6oEk4ptjanqhZjzF7JlbPsFly/3mxmMekQZMjW8KuX5BF+ZiO4KnFZ49pxs+6+68lf2kPtY3KeIZjrRak3mLucgN3bXnrRsAFrW3iXMftF7pFarRLeyupfKtwZMEv7LNGVfg/DivNCqCFKGAU+p1BCJJ3ae1bujMEF0qGSn2yT3ItFsEk0VPDFP5b76eEQpwqOt/R5vNE1+wox+lhJHTJVK1BctS1AT9ygKDKhkQvSCDUBX1OMdymB0KpualW16slj05asLyqPRXXxXtPWY0Wziil+z5B4A7Dk67D5GATrwR4ecINuaAu+PxB3ReqVAhLTGXuEZHEMd45Zv8KeJPcddbsqLvLiHJIYrcUtvOJLp4Iv+ZFFE2BNeoe/P1WGKd1x3w1Mc3nLr3ZQ6UZaSRVPtlZB6CLSxj3QsL74moW0EZ5iUzYzteoYV2aLeeKWsFrfbkzm01qJY=" matrix: diff --git a/appveyor.yml b/appveyor.yml index 9b21811..788929e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -290,9 +290,13 @@ build_script: cd .. 7z a ./pcl-superbuild-%ANDROID_ABIs%.zip -r ./cachebuild/CMakeExternals/Install/boost-android + 7z a ./pcl-superbuild-%ANDROID_ABIs%.zip -r ./cachebuild/CMakeExternals/Install/flann-android + 7z a ./pcl-superbuild-%ANDROID_ABIs%.zip -r ./cachebuild/CMakeExternals/Install/eigen + 7z a ./pcl-superbuild-%ANDROID_ABIs%.zip -r ./cachebuild/CMakeExternals/Install/qhull-android + 7z a ./pcl-superbuild-%ANDROID_ABIs%.zip -r ./cachebuild/CMakeExternals/Install/pcl-android # on successful build diff --git a/iOSWrapper/CMakeLists.txt b/iOSWrapper/CMakeLists.txt index 171bbc3..23115aa 100644 --- a/iOSWrapper/CMakeLists.txt +++ b/iOSWrapper/CMakeLists.txt @@ -373,7 +373,7 @@ set_target_properties(${FRAMEWORK_NAME} PROPERTIES VERSION 1.0.0 # "compatibility version" in semantic format in Mach-O binary file SOVERSION 1.0.0 - PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}/PointCloudLibraryWrapper.hpp;${CMAKE_CURRENT_LIST_DIR}/vertex.h;${INCLUDE_DIR}" + PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}/PointCloudLibraryWrapper.hpp;${CMAKE_CURRENT_LIST_DIR}/vertex.h" XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${DEPLOYMENT_TARGET} XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer" XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY ${DEVICE_FAMILY} @@ -389,7 +389,7 @@ set_target_properties(${FRAMEWORK_NAME} PROPERTIES VERSION 1.0.0 # "compatibility version" in semantic format in Mach-O binary file SOVERSION 1.0.0 - PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}/PointCloudLibraryWrapper.hpp;${CMAKE_CURRENT_LIST_DIR}/vertex.h;${INCLUDE_DIR}" + PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}/PointCloudLibraryWrapper.hpp;${CMAKE_CURRENT_LIST_DIR}/vertex.h" XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY ${DEVICE_FAMILY} XCODE_ATTRIBUTE_SKIP_INSTALL "YES" ) @@ -403,7 +403,7 @@ set_target_properties(${FRAMEWORK_NAME} PROPERTIES VERSION 1.0.0 # "compatibility version" in semantic format in Mach-O binary file SOVERSION 1.0.0 - PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}/PointCloudLibraryWrapper.hpp;${CMAKE_CURRENT_LIST_DIR}/vertex.h;${INCLUDE_DIR}" + PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}/PointCloudLibraryWrapper.hpp;${CMAKE_CURRENT_LIST_DIR}/vertex.h" XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY ${DEVICE_FAMILY} XCODE_ATTRIBUTE_SKIP_INSTALL "YES" )