Merge pull request #617 from captain0xff/vendor-coin

VolkerEnderlein · web-flow · commit 850deb323abc · 2026-04-02T23:17:09.000+02:00
Fixes and improvements
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -561,14 +561,18 @@ if(WIN32)
     set(COIN_DEFAULT_POSTFIX ${COIN_DEFAULT_STATIC_POSTFIX})
     set(COIN_LIBRARY_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
   endif()
-  set(CMAKE_RELEASE_POSTFIX "${COIN_DEFAULT_POSTFIX}"
-    CACHE STRING "Default filename postfix for libraries under configuration Release")
-  set(CMAKE_MINSIZEREL_POSTFIX "${COIN_DEFAULT_POSTFIX}"
-    CACHE STRING "Default filename postfix for libraries under configuration MinSizeRel")
-  set(CMAKE_RELWITHDEBINFO_POSTFIX "${COIN_DEFAULT_POSTFIX}"
-    CACHE STRING "Default filename postfix for libraries under configuration RelWithDebInfo")
-  set(CMAKE_DEBUG_POSTFIX "${COIN_DEFAULT_POSTFIX}d"
-    CACHE STRING "Default filename postfix for libraries under configuration Debug")
+  # Don't set these if the project is built as cmake a subdirectory
+  if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+    set(CMAKE_RELEASE_POSTFIX "${COIN_DEFAULT_POSTFIX}"
+      CACHE STRING "Default filename postfix for libraries under configuration Release")
+    set(CMAKE_MINSIZEREL_POSTFIX "${COIN_DEFAULT_POSTFIX}"
+      CACHE STRING "Default filename postfix for libraries under configuration MinSizeRel")
+    set(CMAKE_RELWITHDEBINFO_POSTFIX "${COIN_DEFAULT_POSTFIX}"
+      CACHE STRING "Default filename postfix for libraries under configuration RelWithDebInfo")
+    set(CMAKE_DEBUG_POSTFIX "${COIN_DEFAULT_POSTFIX}d"
+      CACHE STRING "Default filename postfix for libraries under configuration Debug")
+  endif()
+
 
   set(COIN_RELEASE_SYSTEM_LIBRARY_NAME Coin${CMAKE_RELEASE_POSTFIX}${COIN_LIBRARY_SUFFIX})
   set(COIN_DEBUG_SYSTEM_LIBRARY_NAME Coin${CMAKE_DEBUG_POSTFIX}${COIN_LIBRARY_SUFFIX})
diff --git a/include/Inventor/SbByteBufferP.icc b/include/Inventor/SbByteBufferP.icc
@@ -31,7 +31,7 @@ class SbByteBufferP {
 INLINE void
 SbByteBuffer::makeUnique()
 {
-  if (PRIVATE(this)->size_ && !PRIVATE(this)->buffer.unique()) {
+  if (PRIVATE(this)->size_ && !(PRIVATE(this)->buffer.use_count() == 1)) {
     std::shared_ptr<char> tmp_buffer(new char [PRIVATE(this)->size_], std::default_delete<char[]>());
     memcpy(tmp_buffer.get(),PRIVATE(this)->buffer.get(),PRIVATE(this)->size_);
     PRIVATE(this)->buffer=tmp_buffer;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -205,6 +205,12 @@ else()
   )
 endif()
 
+# Export a Coin::Coin target when the library is built as a cmake subdirectory
+# so that the same target can be linked using find_package and this method
+if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+  add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
+endif()
+
 if(WIN32)
   if(COIN_BUILD_SHARED_LIBS)
     configure_file(${PROJECT_NAME}.rc.cmake.in ${PROJECT_NAME}.rc)

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class SbByteBufferP {`
`31`	`31`	`INLINE void`
`32`	`32`	`SbByteBuffer::makeUnique()`
`33`	`33`	`{`
`34`		`- if (PRIVATE(this)->size_ && !PRIVATE(this)->buffer.unique()) {`
	`34`	`+ if (PRIVATE(this)->size_ && !(PRIVATE(this)->buffer.use_count() == 1)) {`
`35`	`35`	`std::shared_ptr<char> tmp_buffer(new char [PRIVATE(this)->size_], std::default_delete<char[]>());`
`36`	`36`	`memcpy(tmp_buffer.get(),PRIVATE(this)->buffer.get(),PRIVATE(this)->size_);`
`37`	`37`	`PRIVATE(this)->buffer=tmp_buffer;`