Skip to content

Commit 6ec3acc

Browse files
committed
Specify python version explicitly in TravisCI
1 parent a2c7e6c commit 6ec3acc

2 files changed

Lines changed: 2 additions & 14 deletions

File tree

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ install:
2525
#- conda config --add channels omnia
2626
#- conda config --add channels conda-forge # hightest priority
2727
script:
28+
- pyenv global 3.6
2829
- mkdir build && cd build
29-
- cmake -DPYTHON_WORKAROUND=ON ..
30+
- cmake ..
3031
- make .

CMakeLists.txt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
cmake_minimum_required(VERSION 3.0.2)
22

3-
option(PYTHON_WORKAROUND "Workaround for environments with multiple python versions" OFF)
4-
5-
# Problem building in Travis-CI tried fix:
6-
# https://github.com/pybind/pybind11/issues/236
7-
# This is really a bad fix, as the Python headers
8-
# won't be found in most build environments.
9-
# See also: https://github.com/Fluorescence-Tools/LabelLib/issues/5
10-
if(PYTHON_WORKAROUND)
11-
set(PYTHONLIBS_FOUND TRUE)
12-
set(PYTHON_MODULE_EXTENSION .so)
13-
set(PYTHON_MODULE_PREFIX "")
14-
endif(PYTHON_WORKAROUND)
15-
163
set(CMAKE_CXX_STANDARD 11)
174
if(MSVC)
185
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++11")

0 commit comments

Comments
 (0)