summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Shelhamer <shelhamer@imaginarynumber.net>2017-04-15 00:12:02 (GMT)
committerGitHub <noreply@github.com>2017-04-15 00:12:02 (GMT)
commit69cf20adfd4264f474ed91d2be02dda323d8bb21 (patch)
tree47f809f69139c7eea48679deb7cfeb26b7057e0f
parenta7a7d3082bc43284abbc62f71e45201ccc987c75 (diff)
parent49761d34d18b7063af995b13ecca0fee1bdaf02c (diff)
downloadcaffe-69cf20adfd4264f474ed91d2be02dda323d8bb21.zip
caffe-69cf20adfd4264f474ed91d2be02dda323d8bb21.tar.gz
caffe-69cf20adfd4264f474ed91d2be02dda323d8bb21.tar.bz2
Merge pull request #5539 from shelhamer/caffe-1.0
Caffe 1.0
-rw-r--r--CMakeLists.txt4
-rw-r--r--Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c52ff46..08f56a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,8 +10,8 @@ endif()
project(Caffe C CXX)
# ---[ Caffe version
-set(CAFFE_TARGET_VERSION "1.0.0-rc5" CACHE STRING "Caffe logical version")
-set(CAFFE_TARGET_SOVERSION "1.0.0-rc5" CACHE STRING "Caffe soname version")
+set(CAFFE_TARGET_VERSION "1.0.0" CACHE STRING "Caffe logical version")
+set(CAFFE_TARGET_SOVERSION "1.0.0" CACHE STRING "Caffe soname version")
add_definitions(-DCAFFE_VERSION=${CAFFE_TARGET_VERSION})
# ---[ Using cmake scripts and modules
diff --git a/Makefile b/Makefile
index 77900b6..4d32416 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ LIB_BUILD_DIR := $(BUILD_DIR)/lib
STATIC_NAME := $(LIB_BUILD_DIR)/lib$(LIBRARY_NAME).a
DYNAMIC_VERSION_MAJOR := 1
DYNAMIC_VERSION_MINOR := 0
-DYNAMIC_VERSION_REVISION := 0-rc5
+DYNAMIC_VERSION_REVISION := 0
DYNAMIC_NAME_SHORT := lib$(LIBRARY_NAME).so
#DYNAMIC_SONAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR)
DYNAMIC_VERSIONED_NAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR).$(DYNAMIC_VERSION_MINOR).$(DYNAMIC_VERSION_REVISION)