Merge pull request #1726 from Idclip/ax_windows_build_fix

Idclip · web-flow · commit e2011c53cf77 · 2023-12-19T19:16:04.000+13:00
Fixed an issue with AX's cmake on windows producing the same library …
diff --git a/openvdb_ax/openvdb_ax/CMakeLists.txt b/openvdb_ax/openvdb_ax/CMakeLists.txt
@@ -306,6 +306,10 @@ if(OPENVDB_AX_STATIC)
     PROPERTIES OUTPUT_NAME openvdb_ax
   )
 
+  if(WIN32)
+    set_target_properties(openvdb_ax_static PROPERTIES PREFIX "lib")
+  endif()
+
   target_link_libraries(openvdb_ax_static PUBLIC ${OPENVDB_AX_CORE_DEPENDENT_LIBS})
 
   # @todo fix opaque pointer requirements
diff --git a/pendingchanges/ax_windows_cmake_fix.txt b/pendingchanges/ax_windows_cmake_fix.txt
@@ -0,0 +1,3 @@
+Build:
+    - Fixed an issue with OpenVDB AX's CMake on Windows where the static and shared library targets would have the same name
+    [Reported by Nicholas Yue]

Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,10 @@ if(OPENVDB_AX_STATIC)`
`306`	`306`	`PROPERTIES OUTPUT_NAME openvdb_ax`
`307`	`307`	`)`
`308`	`308`
	`309`	`+ if(WIN32)`
	`310`	`+ set_target_properties(openvdb_ax_static PROPERTIES PREFIX "lib")`
	`311`	`+ endif()`
	`312`	`+`
`309`	`313`	`target_link_libraries(openvdb_ax_static PUBLIC ${OPENVDB_AX_CORE_DEPENDENT_LIBS})`
`310`	`314`
`311`	`315`	`# @todo fix opaque pointer requirements`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Build:`
	`2`	`+ - Fixed an issue with OpenVDB AX's CMake on Windows where the static and shared library targets would have the same name`
	`3`	`+ [Reported by Nicholas Yue]`