boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-01-26 18:52:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29 from coroa/master

Browse Source 
cmake: switch from using deprecated linklibraries to target_linklibraries
This commit is contained in:
Jim Bosch
2013-10-10 15:46:08 -07:00
parent c9974daec2 c8798676f6
commit e3bf3c6f51
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -98,10 +98,6 @@ include_directories(
${Boost_INCLUDE_DIRS}
)
# link against boost and python libraries
LINK_LIBRARIES(${Boost_LIBRARIES}) # Deprecated but so convenient!
LINK_LIBRARIES(${PYTHON_LIBRARY})
# install headers
install(DIRECTORY boost
DESTINATION "include"

4
libs/numpy/example/CMakeLists.txt
View File

@@ -3,7 +3,7 @@ macro( addPythonExe _name _srccpp )
ADD_EXECUTABLE(${_name} ${_srccpp})
# make the pyd library link against boost_numpy python and boost
TARGET_LINK_LIBRARIES(${_name} boost_numpy ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
TARGET_LINK_LIBRARIES(${_name} boost_numpy)
# put the example target into a VS solution folder named example (should
# be a no-op for Linux)
@@ -14,7 +14,7 @@ macro( addPythonMod _name _srccpp )
PYTHON_ADD_MODULE(${_name} ${_srccpp})
# make the pyd library link against boost_numpy python and boost
TARGET_LINK_LIBRARIES(${_name} boost_numpy ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
TARGET_LINK_LIBRARIES(${_name} boost_numpy)
# put the example target into a VS solution folder named example (should
# be a no-op for Linux)

1
libs/numpy/src/CMakeLists.txt
View File

@@ -17,6 +17,7 @@ add_library(boost_numpy ${LIBRARY_TYPE}
ufunc.cpp
numpy.cpp
)
target_link_libraries(boost_numpy ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
install(TARGETS boost_numpy
ARCHIVE DESTINATION lib

2
libs/numpy/test/CMakeLists.txt
View File

@@ -17,7 +17,7 @@ set( TestCommand ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${runCmakeTest} )
# custom macro with most of the redundant code for making a python test
macro( addPythonTest _name _srcpy )
# make the pyd library link against boost_numpy python and boost
TARGET_LINK_LIBRARIES(${_name} boost_numpy ${PYTHON_LIBRARIES} ${Boost_LIBRARIES})
TARGET_LINK_LIBRARIES(${_name} boost_numpy)
# make a test of the module using the python source file in the test directory
ADD_TEST(${_name} ${TestCommand} ${TEST_SOURCE_DIR}/${_srcpy})