[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37809] trunk/blender/build_files/cmake/ macros.cmake: fix for building with MSVC release, some edits I made didnt work as I expected but still built for debug

Campbell Barton ideasman42 at gmail.com
Sat Jun 25 16:10:46 CEST 2011


Revision: 37809
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37809
Author:   campbellbarton
Date:     2011-06-25 14:10:46 +0000 (Sat, 25 Jun 2011)
Log Message:
-----------
fix for building with MSVC release, some edits I made didnt work as I expected but still built for debug

Modified Paths:
--------------
    trunk/blender/build_files/cmake/macros.cmake

Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake	2011-06-25 13:23:14 UTC (rev 37808)
+++ trunk/blender/build_files/cmake/macros.cmake	2011-06-25 14:10:46 UTC (rev 37809)
@@ -202,9 +202,8 @@
 
 		if(WIN32 AND NOT UNIX)
 			file_list_suffix(PYTHON_LIBRARIES_DEBUG "${PYTHON_LIBRARIES}" "_d")
-			target_link_libraries(${target}
-					debug ${PYTHON_LIBRARIES_DEBUG}
-					optimized ${PYTHON_LIBRARIES})
+			target_link_libraries(${target} debug ${PYTHON_LIBRARIES_DEBUG})
+			target_link_libraries(${target} optimized ${PYTHON_LIBRARIES})
 			unset(PYTHON_LIBRARIES_DEBUG)
 		else()
 			target_link_libraries(${target} ${PYTHON_LIBRARIES})
@@ -257,9 +256,8 @@
 	if(WITH_IMAGE_OPENEXR)
 		if(WIN32 AND NOT UNIX)
 			file_list_suffix(OPENEXR_LIBRARIES_DEBUG "${OPENEXR_LIBRARIES}" "_d")
-			target_link_libraries(${target}
-					debug ${OPENEXR_LIBRARIES_DEBUG}
-					optimized ${OPENEXR_LIBRARIES})
+			target_link_libraries(${target} debug ${OPENEXR_LIBRARIES_DEBUG})
+			target_link_libraries(${target} optimized ${OPENEXR_LIBRARIES})
 			unset(OPENEXR_LIBRARIES_DEBUG)
 		else()
 			target_link_libraries(${target} ${OPENEXR_LIBRARIES})
@@ -274,22 +272,19 @@
 	if(WITH_OPENCOLLADA)
 		if(WIN32 AND NOT UNIX)
 			file_list_suffix(OPENCOLLADA_LIBRARIES_DEBUG "${OPENCOLLADA_LIBRARIES}" "_d")
-			target_link_libraries(${target}
-					debug ${OPENCOLLADA_LIBRARIES_DEBUG}
-					optimized ${OPENCOLLADA_LIBRARIES})
+			target_link_libraries(${target} debug ${OPENCOLLADA_LIBRARIES_DEBUG})
+			target_link_libraries(${target} optimized ${OPENCOLLADA_LIBRARIES})
 			unset(OPENCOLLADA_LIBRARIES_DEBUG)
 
 			file_list_suffix(PCRE_LIB_DEBUG "${PCRE_LIB}" "_d")
-			target_link_libraries(${target}
-					debug ${PCRE_LIB_DEBUG}
-					optimized ${PCRE_LIB})
+			target_link_libraries(${target} debug ${PCRE_LIB_DEBUG})
+			target_link_libraries(${target} optimized ${PCRE_LIB})
 			unset(PCRE_LIB_DEBUG)
 
 			if(EXPAT_LIB)
 				file_list_suffix(EXPAT_LIB_DEBUG "${EXPAT_LIB}" "_d")
-				target_link_libraries(${target}
-						debug ${EXPAT_LIB_DEBUG}
-						optimized ${EXPAT_LIB})
+				target_link_libraries(${target} debug ${EXPAT_LIB_DEBUG})
+				target_link_libraries(${target} optimized ${EXPAT_LIB})
 				unset(EXPAT_LIB_DEBUG)
 			endif()
 		else()




More information about the Bf-blender-cvs mailing list