[Freeorion-programmers] SF.net SVN: freeorion:[5927] trunk/FreeOrion/GG/cmake/Util.cmake

[<geo...@us...>]

Revision: 5927
          http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5927&view=rev
Author:   geoffthemedio
Date:     2013-03-31 15:32:29 +0000 (Sun, 31 Mar 2013)
Log Message:
-----------
More CMake cleanup by adrian_broher.

Modified Paths:
--------------
    trunk/FreeOrion/GG/cmake/Util.cmake

Modified: trunk/FreeOrion/GG/cmake/Util.cmake
===================================================================
--- trunk/FreeOrion/GG/cmake/Util.cmake	2013-03-31 15:30:14 UTC (rev 5926)
+++ trunk/FreeOrion/GG/cmake/Util.cmake	2013-03-31 15:32:29 UTC (rev 5927)
@@ -103,15 +103,15 @@
     list_contains(IS_DEBUG DEBUG ${ARGN})
     if (IS_DEBUG)
       if (IS_STATIC)
-        set(${PREFIX}_COMPILE_FLAGS "/MTd ${${PREFIX}_COMPILE_FLAGS}")
+        list(APPEND ${PREFIX}_COMPILE_FLAGS "/MTd")
       else (IS_STATIC)
-        set(${PREFIX}_COMPILE_FLAGS "/MDd ${${PREFIX}_COMPILE_FLAGS}")
+        list(APPEND ${PREFIX}_COMPILE_FLAGS "/MDd")
       endif (IS_STATIC)       
     else (IS_DEBUG)
       if (IS_STATIC)
-        set(${PREFIX}_COMPILE_FLAGS "/MT ${${PREFIX}_COMPILE_FLAGS}")
+        list(APPEND ${PREFIX}_COMPILE_FLAGS "/MT")
       else (IS_STATIC)
-        set(${PREFIX}_COMPILE_FLAGS "/MD ${${PREFIX}_COMPILE_FLAGS}")
+        list(APPEND ${PREFIX}_COMPILE_FLAGS "/MD")
       endif (IS_STATIC)       
     endif (IS_DEBUG)
   endif (MSVC)  
@@ -150,9 +150,9 @@
     endif (NOT BUILD_${ARG})
 
     # Accumulate compile and link flags
-    set(THIS_VARIANT_COMPILE_FLAGS "${THIS_VARIANT_COMPILE_FLAGS} ${THIS_LIB_${ARG}_COMPILE_FLAGS} ${${ARG}_COMPILE_FLAGS}")
-    set(THIS_VARIANT_LINK_FLAGS "${THIS_VARIANT_LINK_FLAGS} ${THIS_LIB_${ARG}_LINK_FLAGS} ${${ARG}_LINK_FLAGS}")
-    set(THIS_VARIANT_LINK_LIBS ${THIS_VARIANT_LINK_LIBS} ${THIS_LIB_${ARG}_LINK_LIBS} ${${ARG}_LINK_LIBS})
+    list(APPEND THIS_VARIANT_COMPILE_FLAGS ${THIS_LIB_${ARG}_COMPILE_FLAGS} ${${ARG}_COMPILE_FLAGS})
+    list(APPEND THIS_VARIANT_LINK_FLAGS ${THIS_LIB_${ARG}_LINK_FLAGS} ${${ARG}_LINK_FLAGS})
+    list(APPEND THIS_VARIANT_LINK_LIBS ${THIS_LIB_${ARG}_LINK_LIBS} ${${ARG}_LINK_LIBS})
   endforeach (ARG ${ARGN})
 
   # Handle feature interactions