[Bf-blender-cvs] [664a088] opensubdiv-modifier: Fix debug build compilation on linux

Sergey Sharybin noreply at git.blender.org
Sun May 25 04:36:12 CEST 2014


Commit: 664a08843d0f354ac9535f1fa866b062bfa0545c
Author: Sergey Sharybin
Date:   Wed May 21 15:09:03 2014 +0200
https://developer.blender.org/rB664a08843d0f354ac9535f1fa866b062bfa0545c

Fix debug build compilation on linux

===================================================================

M	build_files/cmake/macros.cmake

===================================================================

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 240e048..db1fa5d 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -338,10 +338,14 @@ macro(setup_liblinks
 		target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES})
 	endif()
 	if(WITH_OPENSUBDIV)
-		file_list_suffix(OPENSUBDIV_LIBRARIES_DEBUG "${OPENSUBDIV_LIBRARIES}" "_d")
-		target_link_libraries_debug(${target} "${OPENSUBDIV_LIBRARIES_DEBUG}")
-		target_link_libraries_optimized(${target} "${OPENSUBDIV_LIBRARIES}")
-		unset(OPENSUBDIV_LIBRARIES_DEBUG)
+		if(WIN32 AND NOT UNIX)
+			file_list_suffix(OPENSUBDIV_LIBRARIES_DEBUG "${OPENSUBDIV_LIBRARIES}" "_d")
+			target_link_libraries_debug(${target} "${OPENSUBDIV_LIBRARIES_DEBUG}")
+			target_link_libraries_optimized(${target} "${OPENSUBDIV_LIBRARIES}")
+			unset(OPENSUBDIV_LIBRARIES_DEBUG)
+		else()
+			target_link_libraries(${target} "${OPENSUBDIV_LIBRARIES}")
+		endif()
 	endif()
 	if(WITH_BOOST)
 		target_link_libraries(${target} ${BOOST_LIBRARIES})




More information about the Bf-blender-cvs mailing list