Commit 4585b97a authored by bonnell's avatar bonnell

Add ViSUS binaries provided by Cameron Christensen

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@25693 18c085ea-50e0-402c-830e-de6fd14e8384
parent a06bc538
......@@ -98,7 +98,11 @@ IF (VISUS_INCLUDE_DIR)
IF (VISUS_JUCE)
FIND_LIBRARY(VISUS_GUI_IMPL_LIB Juce ${VISUS_DIR}/lib NO_DEFAULT_PATH)
ENDIF()
FIND_LIBRARY(VISUS_CURL_LIB curl ${VISUS_DIR}/lib NO_DEFAULT_PATH)
IF(WIN32)
FIND_LIBRARY(VISUS_CURL_LIB libcurl ${VISUS_DIR}/lib NO_DEFAULT_PATH)
ELSE()
FIND_LIBRARY(VISUS_CURL_LIB curl ${VISUS_DIR}/lib NO_DEFAULT_PATH)
ENDIF()
FIND_LIBRARY(VISUS_FREEIMAGE_LIB FreeImage ${VISUS_DIR}/lib NO_DEFAULT_PATH)
FIND_LIBRARY(VISUS_XML_LIB tinyxml ${VISUS_DIR}/lib NO_DEFAULT_PATH)
FIND_LIBRARY(VISUS_LIBZ_LIB libz ${VISUS_DIR}/lib NO_DEFAULT_PATH)
......@@ -152,6 +156,7 @@ IF (VISUS_INCLUDE_DIR)
Winmm.lib;
shlwapi.lib
Wininet.lib
psapi.lib
)
###########################################
......
......@@ -308,3 +308,7 @@ VISIT_OPTION_DEFAULT(VISIT_XDMF_LIBDEP
VTK_LIBRARY_DIRS vtklibxml2-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}
TYPE STRING
)
if (MSVC11)
VISIT_OPTION_DEFAULT(VISIT_VISUS_DIR ${VISITHOME}/ViSUS/27d3d79)
endif()
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