From 83f5deab6cfeb850f9f08a0a47cd3e7b39bb8bc7 Mon Sep 17 00:00:00 2001 From: Luke Yeager Date: Fri, 4 Sep 2015 10:34:50 -0700 Subject: [PATCH] CMake versioning fixes --- CMakeLists.txt | 4 ++-- cmake/Summary.cmake | 2 +- src/caffe/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cb2e354a41..2b215da4dc3 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.13") -set(CAFFE_TARGET_SOVERSION "0.13.2") +set(CAFFE_TARGET_VERSION "0.13.2") +set(CAFFE_TARGET_SOVERSION "0.13") # ---[ Using cmake scripts and modules list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake index 72a1110e94c..e5408e30509 100644 --- a/cmake/Summary.cmake +++ b/cmake/Summary.cmake @@ -101,7 +101,7 @@ function(caffe_print_configuration_summary) caffe_status("") caffe_status("******************* Caffe Configuration Summary *******************") caffe_status("General:") - caffe_status(" Version : ${Caffe_VERSION}") + caffe_status(" Version : ${CAFFE_TARGET_VERSION}") caffe_status(" Git : ${Caffe_GIT_VERSION}") caffe_status(" System : ${CMAKE_SYSTEM_NAME}") caffe_status(" C++ compiler : ${CMAKE_CXX_COMPILER}") diff --git a/src/caffe/CMakeLists.txt b/src/caffe/CMakeLists.txt index 96d4e0207a6..73ecd4496b1 100644 --- a/src/caffe/CMakeLists.txt +++ b/src/caffe/CMakeLists.txt @@ -20,7 +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") +set_target_properties(caffe PROPERTIES OUTPUT_NAME "caffe-nv") # ---[ Tests add_subdirectory(test)