Skip to content

Commit 043a3fd

Browse files
vbkaisetsuvbkaisetsu
committed
Fix travis scripts
1 parent e598f9d commit 043a3fd

File tree

5 files changed

+27
-8
lines changed

5 files changed

+27
-8
lines changed

‎.travis/debian.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ docker exec travis-ci bash -c "cd ./pocl && make && make install"
4040

4141
if [ "${WITH_CORE_LIBRARY}" = "yes" ]; then
4242
# script
43-
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build --enable-eigen --enable-opencl"
43+
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build --enable-eigen --enable-opencl -- -DCMAKE_VERBOSE_MAKEFILE=ON"
44+
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build_ext -i --enable-eigen --enable-opencl -- -DCMAKE_VERBOSE_MAKEFILE=ON"
4445
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py test --enable-eigen --enable-opencl"
4546

4647
# test installing by "pip install"
@@ -60,13 +61,14 @@ if [ "${WITH_CORE_LIBRARY}" = "yes" ]; then
6061
docker exec travis-ci bash -c "pip3 uninstall -y primitiv"
6162
else
6263
# install core library
63-
docker exec travis-ci bash -c "cd /primitiv-python/primitiv-core && cmake . -DPRIMITIV_USE_EIGEN=ON -DPRIMITIV_USE_OPENCL=ON"
64+
docker exec travis-ci bash -c "cd /primitiv-python/primitiv-core && cmake . -DPRIMITIV_USE_EIGEN=ON -DPRIMITIV_USE_OPENCL=ON -DCMAKE_VERBOSE_MAKEFILE=ON"
6465
docker exec travis-ci bash -c "cd /primitiv-python/primitiv-core && make"
6566
docker exec travis-ci bash -c "cd /primitiv-python/primitiv-core && make install"
6667
docker exec travis-ci bash -c "ldconfig"
6768

6869
# script
6970
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build --enable-eigen --enable-opencl --no-build-core-library"
71+
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build_ext -i --enable-eigen --enable-opencl --no-build-core-library"
7072
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py test --enable-eigen --enable-opencl --no-build-core-library"
7173

7274
# test installing by "./setup.py install"

‎.travis/fedora.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ if [ "${WITH_CORE_LIBRARY}" = "yes" ]; then
3434
# script
3535
# docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build --enable-eigen --enable-opencl"
3636
# docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py test --enable-eigen --enable-opencl"
37-
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build --enable-eigen"
37+
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build --enable-eigen -- -DCMAKE_VERBOSE_MAKEFILE=ON"
38+
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build_ext -i --enable-eigen -- -DCMAKE_VERBOSE_MAKEFILE=ON"
3839
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py test --enable-eigen"
3940

4041
# test installing by "pip install"
@@ -53,14 +54,15 @@ if [ "${WITH_CORE_LIBRARY}" = "yes" ]; then
5354
else
5455
# install core library
5556
# docker exec travis-ci bash -c "cd /primitiv-python/primitiv-core && cmake . -DPRIMITIV_USE_EIGEN=ON -DPRIMITIV_USE_OPENCL=ON"
56-
docker exec travis-ci bash -c "cd /primitiv-python/primitiv-core && cmake . -DPRIMITIV_USE_EIGEN=ON"
57+
docker exec travis-ci bash -c "cd /primitiv-python/primitiv-core && cmake . -DPRIMITIV_USE_EIGEN=ON -DCMAKE_VERBOSE_MAKEFILE=ON"
5758
docker exec travis-ci bash -c "cd /primitiv-python/primitiv-core && make"
5859
docker exec travis-ci bash -c "cd /primitiv-python/primitiv-core && make install"
5960

6061
# script
6162
# docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build --enable-eigen --enable-opencl --no-build-core-library"
6263
# docker exec travis-ci bash -c "export LD_LIBRARY_PATH=/usr/local/lib && cd /primitiv-python && ./setup.py test --enable-eigen --enable-opencl --no-build-core-library"
6364
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build --enable-eigen --no-build-core-library"
65+
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build_ext -i --enable-eigen --no-build-core-library"
6466
docker exec travis-ci bash -c "export LD_LIBRARY_PATH=/usr/local/lib && cd /primitiv-python && ./setup.py test --enable-eigen --no-build-core-library"
6567

6668
# test installing by "./setup.py install"

‎.travis/osx.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ mkdir work
1414
if [ "${WITH_CORE_LIBRARY}" = "yes" ]; then
1515
# script
1616
git submodule update --init
17-
./setup.py build --enable-eigen
17+
./setup.py build --enable-eigen -- -DCMAKE_VERBOSE_MAKEFILE=ON
18+
./setup.py build_ext -i --enable-eigen -- -DCMAKE_VERBOSE_MAKEFILE=ON
1819
./setup.py test --enable-eigen
1920

2021
# test installing by "pip install"
@@ -40,11 +41,12 @@ if [ "${WITH_CORE_LIBRARY}" = "yes" ]; then
4041
pip3 uninstall -y primitiv
4142
else
4243
pushd primitiv-core
43-
cmake . -DPRIMITIV_USE_EIGEN=ON
44+
cmake . -DPRIMITIV_USE_EIGEN=ON -DCMAKE_VERBOSE_MAKEFILE=ON
4445
make
4546
make install
4647
popd
4748
./setup.py build --enable-eigen --no-build-core-library
49+
./setup.py build_ext -i --enable-eigen --no-build-core-library
4850
./setup.py test --enable-eigen --no-build-core-library
4951

5052
# test installing by "./setup.py install"

‎.travis/ubuntu.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ docker exec travis-ci bash -c "cd ./pocl && make && make install"
2525

2626
if [ "${WITH_CORE_LIBRARY}" = "yes" ]; then
2727
# script
28-
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build --enable-eigen --enable-opencl"
28+
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build --enable-eigen --enable-opencl -- -DCMAKE_VERBOSE_MAKEFILE=ON"
29+
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build_ext -i --enable-eigen --enable-opencl -- -DCMAKE_VERBOSE_MAKEFILE=ON"
2930
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py test --enable-eigen --enable-opencl"
3031

3132
# test installing by "pip install"
@@ -45,13 +46,14 @@ if [ "${WITH_CORE_LIBRARY}" = "yes" ]; then
4546
docker exec travis-ci bash -c "pip3 uninstall -y primitiv"
4647
else
4748
# install core library
48-
docker exec travis-ci bash -c "cd /primitiv-python/primitiv-core && cmake . -DPRIMITIV_USE_EIGEN=ON -DPRIMITIV_USE_OPENCL=ON"
49+
docker exec travis-ci bash -c "cd /primitiv-python/primitiv-core && cmake . -DPRIMITIV_USE_EIGEN=ON -DPRIMITIV_USE_OPENCL=ON -DCMAKE_VERBOSE_MAKEFILE=ON"
4950
docker exec travis-ci bash -c "cd /primitiv-python/primitiv-core && make"
5051
docker exec travis-ci bash -c "cd /primitiv-python/primitiv-core && make install"
5152
docker exec travis-ci bash -c "ldconfig"
5253

5354
# script
5455
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build --enable-eigen --enable-opencl --no-build-core-library"
56+
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py build_ext -i --enable-eigen --enable-opencl --no-build-core-library"
5557
docker exec travis-ci bash -c "cd /primitiv-python && ./setup.py test --enable-eigen --enable-opencl --no-build-core-library"
5658

5759
# test installing by "./setup.py install"

‎setup.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,17 @@ def ext_common_args(*args, libraries=[], **kwargs):
180180
setup_kwargs["cmake_install_dir"] = "./"
181181
setup_kwargs["setup_requires"] = ["scikit-build"]
182182
setup_kwargs["cmake_args"] = ["-DPRIMITIV_BUILD_STATIC_LIBRARY=ON"]
183+
if sys.platform == "darwin":
184+
# NOTE(vbkaisetsu):
185+
# scikit-build adds -DCMAKE_OSX_DEPLOYMENT_TARGET with the default target if it does not
186+
# set manually. However scikit-build does not check cmake_args argument of setup()
187+
# for the target.
188+
try:
189+
cmake_args_pos = sys.argv.index("--")
190+
except ValueError:
191+
cmake_args_pos = len(sys.argv)
192+
sys.argv.append("--")
193+
sys.argv.insert(cmake_args_pos + 1, "-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.12")
183194
if enable_cuda:
184195
setup_kwargs["cmake_args"].append("-DPRIMITIV_USE_CUDA=ON")
185196
if enable_eigen:

0 commit comments

Comments
 (0)