Merge pull request microsoft#46 from lukeyeager/nvidia/cmake-too-much…

…-versioning Remove versioned symlinks from tools
lunzueta · Oct 22, 2015 · aaf7ff0 · aaf7ff0
2 parents 8468d18 + 4617bd6
commit aaf7ff0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/cmake/Targets.cmake b/cmake/Targets.cmake
@@ -110,8 +110,6 @@ function(caffe_default_properties target)
     ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib"
     LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib"
     RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin"
-    VERSION   ${CAFFE_TARGET_VERSION}
-    SOVERSION ${CAFFE_TARGET_SOVERSION}
   )
 
   # make sure we build all external depepdencies first

diff --git a/src/caffe/CMakeLists.txt b/src/caffe/CMakeLists.txt
@@ -20,7 +20,11 @@ endif()
 add_library(caffe ${srcs})
 target_link_libraries(caffe proto ${Caffe_LINKER_LIBS})
 caffe_default_properties(caffe)
-set_target_properties(caffe PROPERTIES OUTPUT_NAME "caffe-nv")
+set_target_properties(caffe PROPERTIES
+    OUTPUT_NAME "caffe-nv"
+    VERSION   ${CAFFE_TARGET_VERSION}
+    SOVERSION ${CAFFE_TARGET_SOVERSION}
+    )
 
 # ---[ Tests
  add_subdirectory(test)