Skip to content

Commit

Permalink
Fix build error in Xcode when building boost (#77)
Browse files Browse the repository at this point in the history 
* Fix build error in Xcode build.

Xcode fails with:
Command /bin/sh emitted errors but did not return a nonzero exit code to indicate failure
if the directory doesn't exists and find throws an error like:
find: .../.hunter/_Base/xxxxxxx/9b6965d/a045106/Build/Boost/__log/Source/bin.v2/libs/log/build/darwin-iphonesimulator/release: No such file or directory

* Increment package internal id for boost.
  • Loading branch information
@Bjoe @rbsheth
Bjoe authored and rbsheth committed Dec 4, 2019
1 parent 26328c9 commit 3fd94aa
Show file tree
Hide file tree
Showing 32 changed files with 66 additions and 38 deletions.
2 changes: 1 addition & 1 deletion cmake/projects/Boost/atomic/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
atomic
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/chrono/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
chrono
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/context/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
context
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/contract/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
contract
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/coroutine/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
coroutine
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/date_time/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
date_time
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/exception/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
exception
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/fiber/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
fiber
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/filesystem/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
filesystem
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/graph/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
graph
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/graph_parallel/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
graph_parallel
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,4 +411,4 @@ endif()

hunter_pick_scheme(DEFAULT url_sha1_boost)
hunter_cacheable(Boost)
hunter_download(PACKAGE_NAME Boost PACKAGE_INTERNAL_DEPS_ID "44")
hunter_download(PACKAGE_NAME Boost PACKAGE_INTERNAL_DEPS_ID "45")
2 changes: 1 addition & 1 deletion cmake/projects/Boost/hunter.cmake.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
boost_component
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/iostreams/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
iostreams
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/locale/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
locale
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/log/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
log
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/math/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
math
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/mpi/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
mpi
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/program_options/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
program_options
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/python/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
python
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/random/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
random
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/regex/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
regex
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
22 changes: 18 additions & 4 deletions cmake/projects/Boost/scripts/create-boost-1-66-ios-fatlib.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,25 @@ INSTALL_DIR="$4"

COMMON_DIR="${BUILD_DIR}/bin.v2/libs/${DIRNAME}/build"

IPHONE_DEBUG=`find "${COMMON_DIR}/darwin-gnu-iphoneos/debug" -name "libboost_${LIBNAME}[^_]*.a"`
IPHONE_RELEASE=`find "${COMMON_DIR}/darwin-gnu-iphoneos/release" -name "libboost_${LIBNAME}[^_]*.a"`
if [[ -d "${COMMON_DIR}/darwin-gnu-iphoneos/debug" ]]
then
IPHONE_DEBUG=`find "${COMMON_DIR}/darwin-gnu-iphoneos/debug" -name "libboost_${LIBNAME}[^_]*.a"`
fi

if [[ -d "${COMMON_DIR}/darwin-gnu-iphoneos/release" ]]
then
IPHONE_RELEASE=`find "${COMMON_DIR}/darwin-gnu-iphoneos/release" -name "libboost_${LIBNAME}[^_]*.a"`
fi

SIM_DEBUG=`find "${COMMON_DIR}/darwin-gnu-iphonesimulator/debug" -name "libboost_${LIBNAME}[^_]*.a"`
SIM_RELEASE=`find "${COMMON_DIR}/darwin-gnu-iphonesimulator/release" -name "libboost_${LIBNAME}[^_]*.a"`
if [[ -d "${COMMON_DIR}/darwin-gnu-iphonesimulator/debug" ]]
then
SIM_DEBUG=`find "${COMMON_DIR}/darwin-gnu-iphonesimulator/debug" -name "libboost_${LIBNAME}[^_]*.a"`
fi

if [[ -d "${COMMON_DIR}/darwin-gnu-iphonesimulator/release" ]]
then
SIM_RELEASE=`find "${COMMON_DIR}/darwin-gnu-iphonesimulator/release" -name "libboost_${LIBNAME}[^_]*.a"`
fi

echo "-- [iOS universal] IPHONE_DEBUG: $IPHONE_DEBUG"
echo "-- [iOS universal] IPHONE_RELEASE: $IPHONE_RELEASE"
Expand Down
22 changes: 18 additions & 4 deletions cmake/projects/Boost/scripts/create-boost-ios-fatlib.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,25 @@ INSTALL_DIR="$4"

COMMON_DIR="${BUILD_DIR}/bin.v2/libs/${DIRNAME}/build"

IPHONE_DEBUG=`find "${COMMON_DIR}/darwin-iphoneos/debug" -name "libboost_${LIBNAME}[^_]*.a"`
IPHONE_RELEASE=`find "${COMMON_DIR}/darwin-iphoneos/release" -name "libboost_${LIBNAME}[^_]*.a"`
if [[ -d "${COMMON_DIR}/darwin-iphoneos/debug" ]]
then
IPHONE_DEBUG=`find "${COMMON_DIR}/darwin-iphoneos/debug" -name "libboost_${LIBNAME}[^_]*.a"`
fi

if [[ -d "${COMMON_DIR}/darwin-iphoneos/release" ]]
then
IPHONE_RELEASE=`find "${COMMON_DIR}/darwin-iphoneos/release" -name "libboost_${LIBNAME}[^_]*.a"`
fi

SIM_DEBUG=`find "${COMMON_DIR}/darwin-iphonesimulator/debug" -name "libboost_${LIBNAME}[^_]*.a"`
SIM_RELEASE=`find "${COMMON_DIR}/darwin-iphonesimulator/release" -name "libboost_${LIBNAME}[^_]*.a"`
if [[ -d "${COMMON_DIR}/darwin-iphonesimulator/debug" ]]
then
SIM_DEBUG=`find "${COMMON_DIR}/darwin-iphonesimulator/debug" -name "libboost_${LIBNAME}[^_]*.a"`
fi

if [[ -d "${COMMON_DIR}/darwin-iphonesimulator/release" ]]
then
SIM_RELEASE=`find "${COMMON_DIR}/darwin-iphonesimulator/release" -name "libboost_${LIBNAME}[^_]*.a"`
fi

echo "-- [iOS universal] IPHONE_DEBUG: $IPHONE_DEBUG"
echo "-- [iOS universal] IPHONE_RELEASE: $IPHONE_RELEASE"
Expand Down
2 changes: 1 addition & 1 deletion cmake/projects/Boost/serialization/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
serialization
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/signals/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
signals
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/stacktrace/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
stacktrace
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/system/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
system
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/test/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
test
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/thread/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
thread
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/timer/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
timer
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)
2 changes: 1 addition & 1 deletion cmake/projects/Boost/wave/hunter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ hunter_download(
Boost
PACKAGE_COMPONENT
wave
PACKAGE_INTERNAL_DEPS_ID "44"
PACKAGE_INTERNAL_DEPS_ID "45"
)

0 comments on commit 3fd94aa

Please sign in to comment.