Text archives Help
- From: boulos@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [MANTA] r1584 - trunk/CMake
- Date: Mon, 30 Jul 2007 18:02:50 -0600 (MDT)
Author: boulos
Date: Mon Jul 30 18:02:50 2007
New Revision: 1584
Modified:
trunk/CMake/Macros.cmake
Log:
Fixing incorrect replacement (didn't ensure that the
whole word was matched). Need to determine if the
CMake REGEX format will allow for a "cleaner" version for now
options will have a space at the front and back.
Modified: trunk/CMake/Macros.cmake
==============================================================================
--- trunk/CMake/Macros.cmake (original)
+++ trunk/CMake/Macros.cmake Mon Jul 30 18:02:50 2007
@@ -25,11 +25,13 @@
SET(TMP ${arg}) #elsewise the Seperate command doesn't work)
SEPARATE_ARGUMENTS(TMP)
FOREACH(option ${TMP})
- STRING(REGEX REPLACE " ${option}" "" ${parameter}
+ # We might already have this option. Look for it and remove it so when
+ # we add again, it doesn't add another copy.
+ STRING(REGEX REPLACE " ${option} " "" ${parameter}
"${${parameter}}")
- STRING(REGEX REPLACE "${option}" "" ${parameter}
- "${${parameter}}")
- SET(${parameter} "${${parameter}} ${option}" CACHE STRING
+ #STRING(REGEX REPLACE "${option}" "" ${parameter}
+ # "${${parameter}}")
+ SET(${parameter} "${${parameter}} ${option} " CACHE STRING
"" FORCE)
ENDFOREACH(option ${TMP})
ENDFOREACH(arg ${ARGN})
- [MANTA] r1584 - trunk/CMake, boulos, 07/30/2007
Archive powered by MHonArc 2.6.16.