Skip to content

Commit 34d6937

Browse files
authored
Merge pull request #103 from jcarpent/devel
Fix issue for pkg-config export of the lib
2 parents bc37f01 + 85e64ee commit 34d6937

File tree

3 files changed

+23
-7
lines changed

3 files changed

+23
-7
lines changed

.travis.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
language: python
2-
python:
3-
- "2.7"
4-
- "3.5"
52
sudo: required
63
compiler:
74
- gcc
@@ -22,14 +19,28 @@ jobs:
2219
include:
2320
- dist: bionic
2421
env: BUILDTYPE=Release
22+
python: 2.7
23+
- dist: bionic
24+
env: BUILDTYPE=Release
25+
python: 3.6
2526
- dist: bionic
2627
env: BUILDTYPE=Debug
28+
python: 2.7
29+
- dist: bionic
30+
env: BUILDTYPE=Debug
31+
python: 3.6
2732
- dist: xenial
2833
env: BUILDTYPE=Release
34+
python: 2.7
2935
- dist: xenial
30-
env: BUILDTYPE=Debug
36+
env: BUILDTYPE=Release
37+
python: 3.5
3138
- dist: trusty
32-
env: BUILDTYPE=Debug
39+
env: BUILDTYPE=Release
40+
python: 2.7
41+
- dist: trusty
42+
env: BUILDTYPE=Release
43+
python: 3.4
3344

3445
notifications:
3546
email:
@@ -44,6 +55,7 @@ install: pip install coveralls numpy
4455
script:
4556
- export CMAKE_ADDITIONAL_OPTIONS="-DCMAKE_BUILD_TYPE=${BUILDTYPE}"
4657
- sudo free -m -t
58+
- ls -l /usr/lib/x86_64-linux-gnu/libboost_python*
4759
- ./.travis/run ../travis_custom/custom_build
4860
after_failure: ./.travis/run after_failure
4961
after_success: ./.travis/run after_success

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,11 @@ SET(${PROJECT_NAME}_SOURCES
126126
)
127127

128128
ADD_LIBRARY(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
129-
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SUFFIX "${PYTHON_EXT_SUFFIX}")
129+
SET(LIB_${PROJECT_NAME}_SUFFIX ${PYTHON_EXT_SUFFIX})
130+
IF(APPLE)
131+
STRING(REPLACE ".so" ".dylib" LIB_${PROJECT_NAME}_SUFFIX ${LIB_${PROJECT_NAME}_SUFFIX})
132+
ENDIF(APPLE)
133+
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SUFFIX "${LIB_${PROJECT_NAME}_SUFFIX}")
130134
TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:-bigobj>)
131135

132136
TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME})

cmake

0 commit comments

Comments
 (0)