Commit e02f25cd authored by whitlocb's avatar whitlocb
Browse files

Local path filtering for VisItLibraryDependencies.cmake.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12909 18c085ea-50e0-402c-830e-de6fd14e8384
parent 16496b44
...@@ -177,6 +177,11 @@ ...@@ -177,6 +177,11 @@
# #
# Mark C. Miller, Fri Oct 22 12:28:25 PDT 2010 # Mark C. Miller, Fri Oct 22 12:28:25 PDT 2010
# Added missing LIBDEP support for ExodusII dependence on (its own) netcdf. # Added missing LIBDEP support for ExodusII dependence on (its own) netcdf.
#
# Brad Whitlock, Fri Oct 29 16:56:34 PDT 2010
# I added some more filtering when generating VisItLibraryDependencies.cmake
# so it does not include local path names for Qt and Python.
#
#****************************************************************************/ #****************************************************************************/
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
...@@ -1716,7 +1721,10 @@ FUNCTION(FILTER_LIBRARY_DEPENDENCIES filename) ...@@ -1716,7 +1721,10 @@ FUNCTION(FILTER_LIBRARY_DEPENDENCIES filename)
ENDIF(\"\${line}\" MATCHES \".*\${suppress}_LIB_DEPENDS.*\") ENDIF(\"\${line}\" MATCHES \".*\${suppress}_LIB_DEPENDS.*\")
ENDFOREACH(suppress) ENDFOREACH(suppress)
IF(\${outputLine} STREQUAL \"TRUE\") IF(\${outputLine} STREQUAL \"TRUE\")
FILE(APPEND \${filename} \"\${line}\\n\") STRING(REPLACE \"${QT_LIBRARY_DIR}/\" \"\\\${VISIT_LIBRARY_DIR}/\" filteredline \"\${line}\")
STRING(REPLACE \"${VISIT_PYTHON_DIR}/lib/\" \"\\\${VISIT_LIBRARY_DIR}/\" filteredline2 \"\${filteredline}\")
STRING(REPLACE \"/libQtUiTools.a\" \"/../archives/libQtUiTools.a\" filteredline3 \"\${filteredline2}\")
FILE(APPEND \${filename} \"\${filteredline3}\\n\")
ENDIF(\${outputLine} STREQUAL \"TRUE\") ENDIF(\${outputLine} STREQUAL \"TRUE\")
ENDFOREACH(line) ENDFOREACH(line)
ENDFUNCTION(FILTER_LIBRARY_DEPENDENCIES) ENDFUNCTION(FILTER_LIBRARY_DEPENDENCIES)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment