diff options
| author | Evan Shelhamer <shelhamer@imaginarynumber.net> | 2017-02-16 16:35:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-16 16:35:51 -0800 |
| commit | 9bb1b9cde2f5a9b0294a64626f7154cc746e303b (patch) | |
| tree | a4cf47c395aed6c83dbc496d355890b717df2bb9 /python | |
| parent | 475d6195e835467e0f2642f7bec4e7ecd36f43e6 (diff) | |
| parent | 6ed799cb206c6b70bdd260d62e8ff3e077f5b635 (diff) | |
| download | caffeonacl-9bb1b9cde2f5a9b0294a64626f7154cc746e303b.tar.gz caffeonacl-9bb1b9cde2f5a9b0294a64626f7154cc746e303b.tar.bz2 caffeonacl-9bb1b9cde2f5a9b0294a64626f7154cc746e303b.zip | |
Merge pull request #4609 from intelfx/BVLC-work-buildsystem
[cmake] Improvements to the build system
Diffstat (limited to 'python')
| -rw-r--r-- | python/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index bf492a24..c53299d2 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -3,13 +3,13 @@ if(NOT HAVE_PYTHON) return() endif() -include_directories(${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) file(GLOB_RECURSE python_srcs ${PROJECT_SOURCE_DIR}/python/*.cpp) add_library(pycaffe SHARED ${python_srcs}) -target_link_libraries(pycaffe ${Caffe_LINK} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES}) -set_target_properties(pycaffe PROPERTIES PREFIX "" OUTPUT_NAME "_caffe") caffe_default_properties(pycaffe) +set_target_properties(pycaffe PROPERTIES PREFIX "" OUTPUT_NAME "_caffe") +target_include_directories(pycaffe PUBLIC ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIR}) +target_link_libraries(pycaffe PUBLIC ${Caffe_LINK} ${PYTHON_LIBRARIES}) if(UNIX OR APPLE) set(__linkname "${PROJECT_SOURCE_DIR}/python/caffe/_caffe.so") |