Updating our Linux/OS X/iOS binary name from libcasablanca.so to use

stgates · stgates · commit 085e22d4fa96 · 2014-05-15T18:00:35.000-07:00
cpprest and include the version number. So for the next release the
name is libcpprest_2_1.so. I also bumped the version number for the
Windows binaries and the sources macro.
diff --git a/Build/version.props b/Build/version.props
@@ -3,12 +3,9 @@
   <PropertyGroup>
     <CppRestBaseFileName>cpprest</CppRestBaseFileName>
     <CppRestSDKVersionMajor>2</CppRestSDKVersionMajor>
-    <CppRestSDKVersionMinor>0</CppRestSDKVersionMinor>
-    <CppRestSDKVersionRevision>1</CppRestSDKVersionRevision>
+    <CppRestSDKVersionMinor>1</CppRestSDKVersionMinor>
+    <CppRestSDKVersionRevision>0</CppRestSDKVersionRevision>
     <CppRestSDKVersionFileSuffix>$(CppRestSDKVersionMajor)_$(CppRestSDKVersionMinor)</CppRestSDKVersionFileSuffix>
     <CppRestSDKVersionString>$(CppRestSDKVersionMajor).$(CppRestSDKVersionMinor)</CppRestSDKVersionString>
   </PropertyGroup>
-<!--
-  Note: remember to regenerate guiddefs.wxi files using gen_guids_for_msi.ps1 whenever major or minor version file changes
--->
 </Project>
diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt
@@ -62,7 +62,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
   message("-- Setting gcc options")
 
   set(WARNINGS "-Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code")
-  set(LINUX_SUPPRESSIONS "-Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-unused-function -Wno-char-subscripts -Wno-switch -Wno-unused-but-set-parameter -Wno-deprecated -Wno-unused-value -Wno-unused-local-typedefs")
+  set(LINUX_SUPPRESSIONS "-Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-unused-function -Wno-char-subscripts -Wno-switch -Wno-unused-but-set-parameter -Wno-unused-value -Wno-unused-local-typedefs")
 
   set(WARNINGS "${WARNINGS} ${LINUX_SUPPRESSIONS}")
   set(LD_FLAGS "${LD_FLAGS} -Wl,-z,defs")
@@ -81,7 +81,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
 # These settings can be used by the test targets
 set(Casablanca_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
 set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include ${Boost_INCLUDE_DIR})
-set(Casablanca_LIBRARY ${LIB}casablanca)
+set(Casablanca_LIBRARY ${LIB}cpprest_2_1)
 set(Casablanca_LIBRARIES ${Casablanca_LIBRARY} ${Boost_LIBRARIES} ${Boost_FRAMEWORK})
 
 
diff --git a/Release/include/cpprest/version.h b/Release/include/cpprest/version.h
@@ -15,8 +15,8 @@
 *
 * ==--==
 */
-#define CPPREST_VERSION_REVISION 1
-#define CPPREST_VERSION_MINOR 0
+#define CPPREST_VERSION_REVISION 0
+#define CPPREST_VERSION_MINOR 1
 #define CPPREST_VERSION_MAJOR 2
 
 #define CPPREST_VERSION (CPPREST_VERSION_MAJOR*100000+CPPREST_VERSION_MINOR*100+CPPREST_VERSION_REVISION)
diff --git a/Release/src/CMakeLists.txt b/Release/src/CMakeLists.txt
@@ -54,9 +54,7 @@ elseif(WIN32)
     )
   add_definitions(
     -D_ASYNCRT_EXPORT
-    -DAZURESTORAGESERVICES_EXPORTS
     -D_PPLX_EXPORT
-    -DWIN32
     -D_MBCS
     -D_USRDLL
     )
@@ -65,9 +63,9 @@ endif()
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNINGS} -Werror -pedantic")
 
-add_library(${LIB}casablanca ${SOURCES})
+add_library(${Casablanca_LIBRARY} ${SOURCES})
 
-target_link_libraries(${LIB}casablanca
+target_link_libraries(${Casablanca_LIBRARY}
   ${OPENSSL_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT}
   ${Boost_FRAMEWORK}
diff --git a/Release/tests/Common/utilities/CMakeLists.txt b/Release/tests/Common/utilities/CMakeLists.txt
@@ -12,7 +12,7 @@ add_library(${LIB}common_utilities
   )
   
 target_link_libraries(${LIB}common_utilities
-  ${LIB}casablanca
+  ${Casablanca_LIBRARY}
   ${LIB}unittestpp
   ${BOOST_SYSTEM_LIBRARY}
   ${BOOST_THREAD_LIBRARY}

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ add_library(${LIB}common_utilities`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`target_link_libraries(${LIB}common_utilities`
`15`		`- ${LIB}casablanca`
	`15`	`+ ${Casablanca_LIBRARY}`
`16`	`16`	`${LIB}unittestpp`
`17`	`17`	`${BOOST_SYSTEM_LIBRARY}`
`18`	`18`	`${BOOST_THREAD_LIBRARY}`