From d6fc6cbe700b964455bcf8169be4403184aab2c2 Mon Sep 17 00:00:00 2001 From: Luke Yeager Date: Thu, 3 Sep 2015 13:37:12 -0700 Subject: [PATCH 1/4] Remove hacky CMake versioning --- cmake/Targets.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmake/Targets.cmake b/cmake/Targets.cmake index fefa9e89d37..e3ad872313b 100644 --- a/cmake/Targets.cmake +++ b/cmake/Targets.cmake @@ -106,8 +106,6 @@ endfunction() # caffe_default_properties() function(caffe_default_properties target) set_target_properties(${target} PROPERTIES - OUTPUT_NAME caffe-nv - SOVERSION 0.13.2 DEBUG_POSTFIX ${Caffe_DEBUG_POSTFIX} ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib" LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib" From 454d3a1b2a7f08035452ba4fcb5cc11bc64c5292 Mon Sep 17 00:00:00 2001 From: Lumin Zhou Date: Thu, 3 Sep 2015 07:55:40 +0000 Subject: [PATCH 2/4] Update CMakeLists.txt --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1b6f1b1363..1beacb30e32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,10 @@ cmake_minimum_required(VERSION 2.8.7) # ---[ Caffe project project(Caffe C CXX) +# ---[ Caffe version +set(CAFFE_TARGET_VERSION "0") +set(CAFFE_TARGET_SOVERSION "0") + # ---[ Using cmake scripts and modules list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) From f239b7c6f3ee67c309176db52c3459dc96f5eeda Mon Sep 17 00:00:00 2001 From: Lumin Zhou Date: Thu, 3 Sep 2015 07:58:08 +0000 Subject: [PATCH 3/4] Update Targets.cmake Conflicts: cmake/Targets.cmake --- cmake/Targets.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/Targets.cmake b/cmake/Targets.cmake index e3ad872313b..c0b8ec9abe3 100644 --- a/cmake/Targets.cmake +++ b/cmake/Targets.cmake @@ -109,7 +109,10 @@ function(caffe_default_properties target) DEBUG_POSTFIX ${Caffe_DEBUG_POSTFIX} ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib" LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib" - RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin") + RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin" + VERSION ${CAFFE_TARGET_VERSION} + SOVERSION ${CAFFE_TARGET_SOVERSION} + ) endfunction() ################################################################################################ From 862de725c02c12255dc61f8af55ab0bfd27d30fd Mon Sep 17 00:00:00 2001 From: Luke Yeager Date: Thu, 3 Sep 2015 13:44:27 -0700 Subject: [PATCH 4/4] Mark v0.13.2 (again) --- CMakeLists.txt | 4 ++-- src/caffe/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1beacb30e32..2cb2e354a41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,8 @@ cmake_minimum_required(VERSION 2.8.7) project(Caffe C CXX) # ---[ Caffe version -set(CAFFE_TARGET_VERSION "0") -set(CAFFE_TARGET_SOVERSION "0") +set(CAFFE_TARGET_VERSION "0.13") +set(CAFFE_TARGET_SOVERSION "0.13.2") # ---[ Using cmake scripts and modules list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) diff --git a/src/caffe/CMakeLists.txt b/src/caffe/CMakeLists.txt index 40e6c11f5b0..96d4e0207a6 100644 --- a/src/caffe/CMakeLists.txt +++ b/src/caffe/CMakeLists.txt @@ -20,6 +20,7 @@ endif() add_library(caffe ${srcs}) target_link_libraries(caffe proto ${Caffe_LINKER_LIBS}) caffe_default_properties(caffe) +set_target_properties(${target} PROPERTIES OUTPUT_NAME "caffe-nv") # ---[ Tests add_subdirectory(test)