Skip to content

Commit

Permalink
Merge pull request #103 from jcarpent/devel
Browse files Browse the repository at this point in the history
Fix issue for pkg-config export of the lib
  • Loading branch information
jcarpent authored Oct 29, 2019
2 parents bc37f01 + 85e64ee commit 34d6937
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 7 deletions.
22 changes: 17 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
language: python
python:
- "2.7"
- "3.5"
sudo: required
compiler:
- gcc
Expand All @@ -22,14 +19,28 @@ jobs:
include:
- dist: bionic
env: BUILDTYPE=Release
python: 2.7
- dist: bionic
env: BUILDTYPE=Release
python: 3.6
- dist: bionic
env: BUILDTYPE=Debug
python: 2.7
- dist: bionic
env: BUILDTYPE=Debug
python: 3.6
- dist: xenial
env: BUILDTYPE=Release
python: 2.7
- dist: xenial
env: BUILDTYPE=Debug
env: BUILDTYPE=Release
python: 3.5
- dist: trusty
env: BUILDTYPE=Debug
env: BUILDTYPE=Release
python: 2.7
- dist: trusty
env: BUILDTYPE=Release
python: 3.4

notifications:
email:
Expand All @@ -44,6 +55,7 @@ install: pip install coveralls numpy
script:
- export CMAKE_ADDITIONAL_OPTIONS="-DCMAKE_BUILD_TYPE=${BUILDTYPE}"
- sudo free -m -t
- ls -l /usr/lib/x86_64-linux-gnu/libboost_python*
- ./.travis/run ../travis_custom/custom_build
after_failure: ./.travis/run after_failure
after_success: ./.travis/run after_success
6 changes: 5 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,11 @@ SET(${PROJECT_NAME}_SOURCES
)

ADD_LIBRARY(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SUFFIX "${PYTHON_EXT_SUFFIX}")
SET(LIB_${PROJECT_NAME}_SUFFIX ${PYTHON_EXT_SUFFIX})
IF(APPLE)
STRING(REPLACE ".so" ".dylib" LIB_${PROJECT_NAME}_SUFFIX ${LIB_${PROJECT_NAME}_SUFFIX})
ENDIF(APPLE)
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SUFFIX "${LIB_${PROJECT_NAME}_SUFFIX}")
TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:-bigobj>)

TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME})
Expand Down
2 changes: 1 addition & 1 deletion cmake
Submodule cmake updated 2 files
+19 −5 pkg-config.cmake
+23 −0 python.cmake

0 comments on commit 34d6937

Please sign in to comment.