[Plplot-cvs] SF.net SVN: plplot:[9947] trunk/cmake/modules/pkg-config.cmake

[<and...@us...>]

Revision: 9947
          http://plplot.svn.sourceforge.net/plplot/?rev=9947&view=rev
Author:   andrewross
Date:     2009-05-09 10:12:10 +0000 (Sat, 09 May 2009)

Log Message:
-----------
Comment out recent fix to pkg-config.cmake since Alan's patch handles the Qt issue explicitly and so this is not currently required.

Modified Paths:
--------------
    trunk/cmake/modules/pkg-config.cmake

Modified: trunk/cmake/modules/pkg-config.cmake
===================================================================
--- trunk/cmake/modules/pkg-config.cmake	2009-05-09 10:05:54 UTC (rev 9946)
+++ trunk/cmake/modules/pkg-config.cmake	2009-05-09 10:12:10 UTC (rev 9947)
@@ -102,18 +102,21 @@
   # N.B. ${_link_flags_in} must be a string and not a list.
 
   # First strip out optimized / debug options which are not needed
-  # Currently only FindQt4 seems to need this.
-  if(CMAKE_BUILD_TYPE MATCHES "Debug")
-    string(REGEX REPLACE "(^|;)optimized;[^;]*;" "\\1" ${_link_flags_out} "${_link_flags_in}")
-    string(REGEX REPLACE "(^|;)debug;" "\\1" ${_link_flags_out} "${${_link_flags_out}}")
-  else(CMAKE_BUILD_TYPE MATCHES "Debug")
-    string(REGEX REPLACE "(^|;)debug;[^;]*;" "\\1" ${_link_flags_out} "${_link_flags_in}")
-    string(REGEX REPLACE "(^|;)optimized;" "\\1" ${_link_flags_out} "${${_link_flags_out}}")
-  endif(CMAKE_BUILD_TYPE MATCHES "Debug")
+  # Currently only FindQt4 seems to need this so it is handled 
+  # explicitly in the Qt code.
+  # Leave this for reference in case it turns out there is a more
+  # general need for it.
+  #if(CMAKE_BUILD_TYPE MATCHES "Debug")
+  #  string(REGEX REPLACE "(^|;)optimized;[^;]*;" "\\1" ${_link_flags_out} "${_link_flags_in}")
+  #  string(REGEX REPLACE "(^|;)debug;" "\\1" ${_link_flags_out} "${${_link_flags_out}}")
+  #else(CMAKE_BUILD_TYPE MATCHES "Debug")
+  #  string(REGEX REPLACE "(^|;)debug;[^;]*;" "\\1" ${_link_flags_out} "${_link_flags_in}")
+  #  string(REGEX REPLACE "(^|;)optimized;" "\\1" ${_link_flags_out} "${${_link_flags_out}}")
+  #endif(CMAKE_BUILD_TYPE MATCHES "Debug")
 
   #message("(original link flags) = ${_link_flags_in}")
   # Convert link flags to a blank-delimited string.
-  string(REGEX REPLACE ";" " " ${_link_flags_out} "${${_link_flags_out}}")
+  string(REGEX REPLACE ";" " " ${_link_flags_out} "${_link_flags_in}")
   #message("(blanks) ${_link_flags_out} = ${${_link_flags_out}}")
 
   # Replace actual library names with the -LPATHNAME and -lLIBRARYNAME form


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.