Merge branch 'db/fix-OCE-0.14'

CMakeLists.txt

@@ -23,12 +23,12 @@ set(OCE_VERSION_MAJOR 0)
 set(OCE_VERSION_MINOR 14)
 # OCE_VERSION_PATCH is used for bugfixes releases only
 # (uncomment following line)
-#set(OCE_VERSION_PATCH 0)
+set(OCE_VERSION_PATCH 1)
 #  Empty for official releases, set to -dev, -rc1, etc for development releases
 set(OCE_VERSION_DEVEL)
 
 # bugfix release: add ${OCE_VERSION_PATCH} to OCE_VERSION
-set(OCE_VERSION ${OCE_VERSION_MAJOR}.${OCE_VERSION_MINOR}${OCE_VERSION_DEVEL})
+set(OCE_VERSION ${OCE_VERSION_MAJOR}.${OCE_VERSION_MINOR}.${OCE_VERSION_PATCH}${OCE_VERSION_DEVEL})
 
 set(OCE_ABI_SOVERSION 7)
 set(OCE_ABI_VERSION ${OCE_ABI_SOVERSION}.0.0)
@@ -87,27 +87,27 @@ endif(MSVC)
 ############################
 
 if(MSVC)
-	set( CMAKE_LIBRARY_PREFIX "" )
-	set( CMAKE_LIBRARY_DEBUG_POSTFIX "d" )
+	set( OCE_LIBRARY_PREFIX "" )
+	set( CMAKE_DEBUG_POSTFIX "d" )
 else(MSVC)
-	set( CMAKE_LIBRARY_PREFIX "lib" )
-	set( CMAKE_LIBRARY_DEBUG_POSTFIX "" )
+	set( OCE_LIBRARY_PREFIX "lib" )
 endif(MSVC)
 
+
 if(APPLE)
 	if(OCE_NO_LIBRARY_VERSION)
-		set( CMAKE_LIBRARY_EXTENSION ${CMAKE_SHARED_LIBRARY_SUFFIX} )
+		set( OCE_LIBRARY_EXTENSION ${CMAKE_SHARED_LIBRARY_SUFFIX} )
 	else(OCE_NO_LIBRARY_VERSION)
-		set( CMAKE_LIBRARY_EXTENSION ".${OCE_ABI_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}" )
+		set( OCE_LIBRARY_EXTENSION ".${OCE_ABI_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}" )
 	endif(OCE_NO_LIBRARY_VERSION)
 elseif(WIN32)
 	# Don't encode library versions on Windows systems
-	set( CMAKE_LIBRARY_EXTENSION ${CMAKE_SHARED_LIBRARY_SUFFIX} )
+	set( OCE_LIBRARY_EXTENSION ${CMAKE_SHARED_LIBRARY_SUFFIX} )
 else()
 	if(OCE_NO_LIBRARY_VERSION)
-		set( CMAKE_LIBRARY_EXTENSION ${CMAKE_SHARED_LIBRARY_SUFFIX} )
+		set( OCE_LIBRARY_EXTENSION ${CMAKE_SHARED_LIBRARY_SUFFIX} )
 	else(OCE_NO_LIBRARY_VERSION)
-		set( CMAKE_LIBRARY_EXTENSION "${CMAKE_SHARED_LIBRARY_SUFFIX}.${OCE_ABI_SOVERSION}" )
+		set( OCE_LIBRARY_EXTENSION "${CMAKE_SHARED_LIBRARY_SUFFIX}.${OCE_ABI_SOVERSION}" )
 	endif(OCE_NO_LIBRARY_VERSION)
 endif()
 
@@ -1105,7 +1105,7 @@ if(CMAKE_CONFIGURATION_TYPES OR NMAKE)
 	set(OCE_DEFAULT_CSF_GraphicShr ${CMAKE_SHARED_LIBRARY_PREFIX}TKOpenGl)
 else()
 	# Fully assemble the library name for the other compilers (but omit the library path).
-	set(OCE_DEFAULT_CSF_GraphicShr ${CMAKE_SHARED_LIBRARY_PREFIX}TKOpenGl${CMAKE_LIBRARY_DEBUG_POSTFIX}${CMAKE_LIBRARY_EXTENSION})
+	set(OCE_DEFAULT_CSF_GraphicShr ${CMAKE_SHARED_LIBRARY_PREFIX}TKOpenGl${CMAKE_DEBUG_POSTFIX}${OCE_LIBRARY_EXTENSION})
 endif()
 
 #this is the header used to build OCE
@@ -1390,7 +1390,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${OCE_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${OCE_VERSION_MINOR})
 # bugfix release: add ${OCE_VERSION_PATCH} to the package version
 # (uncomment following line)
-#set(CPACK_PACKAGE_VERSION_PATCH ${OCE_VERSION_PATCH})
+set(CPACK_PACKAGE_VERSION_PATCH ${OCE_VERSION_PATCH})
 set(CPACK_PACKAGE_NAME OCE )
 
 set(CPACK_PACKAGE_CONTACT "OCE Developers <[email protected]>")

NEWS

@@ -1,3 +1,13 @@
+Version 0.14.1 - January 2014
+
+This version is binary compatible with 0CE 0.14.
+
+* Fix Debug build on MSVC.
+
+Users who contributed to this release:
+  Denis Barbier
+
+
 Version 0.14 - December 2013
 
 This version is binary compatible with 0CE 0.13.

adm/cmake/config/oce_build_paths.h.cmake

@@ -12,8 +12,8 @@
 #cmakedefine OCE_INSTALL_DATA_DIR "@OCE_ABSPATH_DATA_DIR@"
 
 /* Debug prefix, postfix and extension for DLLs */
-#define OCE_LIBRARY_PREFIX "@CMAKE_LIBRARY_PREFIX@"
-#define OCE_LIBRARY_EXTENSION "@CMAKE_LIBRARY_EXTENSION@"
+#define OCE_LIBRARY_PREFIX "@OCE_LIBRARY_PREFIX@"
+#define OCE_LIBRARY_EXTENSION "@OCE_LIBRARY_EXTENSION@"
 
 /* Debug postfix for DLLs */
 #if defined(_MSC_VER)
@@ -23,7 +23,7 @@
 #define OCE_LIBRARY_DEBUG_POSTFIX ""
 #endif
 #else
-#define OCE_LIBRARY_DEBUG_POSTFIX "@CMAKE_LIBRARY_DEBUG_POSTFIX@"
+#define OCE_LIBRARY_DEBUG_POSTFIX ""
 #endif
 
 /* Location where TKOpenGl shared library will be installed. */