fix for building with MSVC release, some edits I made didnt work as I expected but...
authorCampbell Barton <ideasman42@gmail.com>
Sat, 25 Jun 2011 14:10:46 +0000 (14:10 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 25 Jun 2011 14:10:46 +0000 (14:10 +0000)
build_files/cmake/macros.cmake

index bb3761d45396d26fcd541a09df07bf71c97daf94..1800c4eb826fa56773c88fe7427fb3e491928e6d 100644 (file)
@@ -202,9 +202,8 @@ macro(setup_liblinks
 
                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 @@ macro(setup_liblinks
        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 @@ macro(setup_liblinks
        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()