From a14f0ef9a96e46f9be0f409561db898d3e4ea427 Mon Sep 17 00:00:00 2001 From: Jinhang Choi Date: Tue, 14 Jun 2016 19:00:37 -0400 Subject: [PATCH 1/2] Fix pyCaffe installation on Cmake for MacOS --- python/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index a22641401f0..7bb81471dcc 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -8,7 +8,7 @@ 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") +set_target_properties(pycaffe PROPERTIES PREFIX "" OUTPUT_NAME "_caffe" SUFFIX ".so") caffe_default_properties(pycaffe) if(UNIX OR APPLE) From cb8e9370970a8f9b04fb68657c02e753add17df7 Mon Sep 17 00:00:00 2001 From: Jinhang Choi Date: Mon, 5 Jun 2017 18:31:49 -0400 Subject: [PATCH 2/2] Consider 2794c97 for cmake compatibility --- python/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 2ef95ca9d59..8f40b1c22cf 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -7,7 +7,12 @@ file(GLOB_RECURSE python_srcs ${PROJECT_SOURCE_DIR}/python/*.cpp) add_library(pycaffe SHARED ${python_srcs}) caffe_default_properties(pycaffe) -set_target_properties(pycaffe PROPERTIES PREFIX "" OUTPUT_NAME "_caffe" SUFFIX ".so") +set_target_properties(pycaffe PROPERTIES PREFIX "" OUTPUT_NAME "_caffe") +if(MSVC) + set_target_properties(pycaffe PROPERTIES SUFFIX ".pyd") +elseif(APPLE) + set_target_properties(pycaffe PROPERTIES SUFFIX ".so") +endif() target_include_directories(pycaffe PUBLIC ${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIR}) target_link_libraries(pycaffe PUBLIC ${Caffe_LINK} ${PYTHON_LIBRARIES})