Skip to content

Commit 522efef

Browse files
author
Dilawar Singh
committed
Compilation fixes for the OSX build.
One test marked as python3 only. The pyrun expression uses python3 specific division and print function. Causes segfault with python2 (wontfix)
1 parent c445446 commit 522efef

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ foreach(_py_script ${PY_SCRIPTS})
495495
endforeach( )
496496

497497
# Replicate Travis-CI building using docker
498-
add_custom_target(travis
498+
add_custom_target(docker
499499
COMMAND docker build -t bhallalab/travis:latest
500500
-f ${CMAKE_CURRENT_SOURCE_DIR}/devel/docker/travis/Dockerfile .
501501
COMMENT "Replicating Travis-CI building using Docker."

devel/docker/travis/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND=noninteractive
55

66
# Install dependencies.
77
RUN apt update && apt install -y cmake gcc g++ make \
8-
libboost-all-dev libgsl-dev libblas-dev \
8+
libboost-all-dev libgsl-dev libblas-dev liblapack-dev \
99
python3-pip python-pip \
1010
python3-numpy python-numpy python3-matplotlib python-matplotlib \
1111
python-tk python3-tk \

tests/py_rdesigneur/test_long_sbml+exp+parser+multithreaded.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
import time
2929
import xml.etree.ElementTree as ET
3030

31+
32+
if sys.version_info.major == 2:
33+
print("[INFO ] this test works with python3 only.")
34+
quit(0)
35+
3136
try:
3237
import moose.SBML
3338
except Exception as e:

utility/utility.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <map>
1717
#include <utility>
1818
#include <cassert>
19+
#include <string>
1920

2021
using namespace std;
2122

@@ -42,7 +43,7 @@ namespace moose
4243
*
4344
* @return
4445
*/
45-
inline string basename( const string& path )
46+
inline std::string basename( const std::string& path )
4647
{
4748
return path.substr( path.find_last_of('/') + 1 );
4849
}

0 commit comments

Comments
 (0)