diff options
| author | Jon Long <jonlong@cs.berkeley.edu> | 2016-07-10 22:11:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-10 22:11:31 -0700 |
| commit | d667a58c2085070beb64ba0135ec139af47986c1 (patch) | |
| tree | fd3e0973a24bccb5d6074e2a5a8a5386aacf838a /python | |
| parent | 776b301845ac1757213de0d95b077687ee98f8c1 (diff) | |
| parent | f9fd20ea3893c515b19cae6fa3693b1649fb9487 (diff) | |
| download | caffeonacl-d667a58c2085070beb64ba0135ec139af47986c1.tar.gz caffeonacl-d667a58c2085070beb64ba0135ec139af47986c1.tar.bz2 caffeonacl-d667a58c2085070beb64ba0135ec139af47986c1.zip | |
Merge pull request #4433 from lukeyeager/bvlc/cmake-install-python
Fix Python installation with CMake install target
Diffstat (limited to 'python')
| -rw-r--r-- | python/CMakeLists.txt | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index a2264140..bf492a24 100644 --- 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) - - |