Browse Source

remove universal configure, add x86_64 configure

pull/19/head
Canming Huang 9 years ago
parent
commit
a69bf6b83c
  1. 12
      platforms/osx/configure
  2. 12
      platforms/osx/configure_universal
  3. 3
      platforms/osx/configure_x86_64

12
platforms/osx/configure

@ -1,13 +1,21 @@
#!/usr/bin/env bash
if [[ $# -lt 1 ]]; then
BUILD_ARCH="i386"
else
BUILD_ARCH="$1"
fi
echo "will built for $BUILD_ARCH"
cd ../..
cd vtk
cmake -DCMAKE_OSX_ARCHITECTURES=i386 -DBUILD_TESTING:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_BUILD_TYPE:BOOL=Release .
cmake -DCMAKE_OSX_ARCHITECTURES=$BUILD_ARCH -DBUILD_TESTING:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_BUILD_TYPE:BOOL=Release .
make
cd ..
cmake -DCMAKE_OSX_ARCHITECTURES=i386 -DBUILD_PERF_TESTS=FALSE -DBUILD_TESTS:BOOL=FALSE -DBUILD_DOCS:BOOL=FALSE -DBUILD_JPEG:BOOL=TRUE -DBUILD_PNG:BOOL=TRUE -DBUILD_TIFF:BOOL=TRUE -DWITH_WEBP:BOOL=OFF -DWITH_IPP:BOOL=OFF -DBUILD_opencv_ts:BOOL=OFF -DBUILD_opencv_apps:BOOL=OFF -DWITH_CUDA:BOOL=OFF -DOPENCV_EXTRA_MODULES_PATH=./opencv_contrib/modules -DBUILD_SHARED_LIBS:BOOL=OFF -DVTK_DIR:STRING=$PWD/vtk -DWITH_LAPACK:BOOL=OFF .
cmake -DCMAKE_OSX_ARCHITECTURES=$BUILD_ARCH -DBUILD_PERF_TESTS=FALSE -DBUILD_TESTS:BOOL=FALSE -DBUILD_DOCS:BOOL=FALSE -DBUILD_JPEG:BOOL=TRUE -DBUILD_PNG:BOOL=TRUE -DBUILD_TIFF:BOOL=TRUE -DWITH_WEBP:BOOL=OFF -DWITH_IPP:BOOL=OFF -DBUILD_opencv_ts:BOOL=OFF -DBUILD_opencv_apps:BOOL=OFF -DWITH_CUDA:BOOL=OFF -DOPENCV_EXTRA_MODULES_PATH=./opencv_contrib/modules -DBUILD_SHARED_LIBS:BOOL=OFF -DVTK_DIR:STRING=$PWD/vtk -DWITH_LAPACK:BOOL=OFF .
make
cd platforms/osx

12
platforms/osx/configure_universal

@ -1,12 +0,0 @@
#!/usr/bin/env bash
cd ../..
cd vtk
cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;i386" -DBUILD_TESTING:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_BUILD_TYPE:BOOL=Release .
make
cd ..
cmake -DCMAKE_OSX_ARCHITECTURES="x86_64;i386" -DBUILD_PERF_TESTS=FALSE -DBUILD_TESTS:BOOL=FALSE -DBUILD_DOCS:BOOL=FALSE -DBUILD_JPEG:BOOL=TRUE -DBUILD_PNG:BOOL=TRUE -DBUILD_TIFF:BOOL=TRUE -DWITH_WEBP:BOOL=OFF -DWITH_IPP:BOOL=OFF -DBUILD_opencv_ts:BOOL=OFF -DBUILD_opencv_apps:BOOL=OFF -DWITH_CUDA:BOOL=OFF -DOPENCV_EXTRA_MODULES_PATH=./opencv_contrib/modules -DBUILD_SHARED_LIBS:BOOL=OFF -DVTK_DIR:STRING=$PWD/vtk -DWITH_LAPACK:BOOL=OFF .
make
cd platforms/osx

3
platforms/osx/configure_x86_64

@ -0,0 +1,3 @@
#!/usr/bin/env bash
configure x86_64
Loading…
Cancel
Save