Merge pull request #190 from lukeyeager/nvidia/cmake-install-python

Fix Python installation with CMake install target
NVIDIA · Jul 8, 2016 · 2b88d9d · 2b88d9d
2 parents 9f55680 + d610000
commit 2b88d9d
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -22,13 +22,19 @@ if(UNIX OR APPLE)
 endif()
 
 # ---[ Install
-file(GLOB files1 *.py requirements.txt)
-install(FILES ${files1} DESTINATION python)
-
-file(GLOB files2 caffe/*.py)
-install(FILES  ${files2} DESTINATION python/caffe)
+# scripts
+file(GLOB python_files *.py requirements.txt)
+install(FILES ${python_files} DESTINATION python)
+
+# module
+install(DIRECTORY caffe
+    DESTINATION python
+    FILES_MATCHING
+    PATTERN "*.py"
+    PATTERN "ilsvrc_2012_mean.npy"
+    PATTERN "test" EXCLUDE
+    )
+
+# _caffe.so
 install(TARGETS pycaffe  DESTINATION python/caffe)
-install(DIRECTORY caffe/imagenet caffe/proto caffe/test DESTINATION python/caffe)
-
-