Commit 213e6e00 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

FindMili: rename to match upstream

parent 6bbc024b
#
# Find the native MILI includes and library
#
# MILI_INCLUDE_DIR - where to find MILI.h, etc.
# MILI_LIBRARIES - List of fully qualified libraries to link against when using MILI.
# MILI_FOUND - Do not attempt to use MILI if "no" or undefined.
FIND_PATH(MILI_INCLUDE_DIR MILIlib.h
/usr/local/include
/usr/include
)
FIND_LIBRARY(MILI_LIBRARY MILI
/usr/local/lib
/usr/lib
)
SET( MILI_FOUND "NO" )
IF(MILI_INCLUDE_DIR)
IF(MILI_LIBRARY)
SET( MILI_LIBRARIES ${MILI_LIBRARY} )
SET( MILI_FOUND "YES" )
ENDIF(MILI_LIBRARY)
ENDIF(MILI_INCLUDE_DIR)
IF(MILI_FIND_REQUIRED AND NOT MILI_FOUND)
message(SEND_ERROR "Unable to find the requested MILI libraries.")
ENDIF(MILI_FIND_REQUIRED AND NOT MILI_FOUND)
# handle the QUIETLY and REQUIRED arguments and set MILI_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MILI DEFAULT_MSG MILI_LIBRARY MILI_INCLUDE_DIR)
MARK_AS_ADVANCED(
MILI_INCLUDE_DIR
MILI_LIBRARY
)
#
# Find the native Mili includes and library
#
# Mili_INCLUDE_DIR - where to find MILIlib.h, etc.
# Mili_LIBRARIES - List of fully qualified libraries to link against when using Mili.
# Mili_FOUND - Do not attempt to use Mili if "no" or undefined.
FIND_PATH(Mili_INCLUDE_DIR MILIlib.h
/usr/local/include
/usr/include
)
FIND_LIBRARY(Mili_LIBRARY MILI
/usr/local/lib
/usr/lib
)
SET( Mili_FOUND "NO" )
IF(Mili_INCLUDE_DIR)
IF(Mili_LIBRARY)
SET( Mili_LIBRARIES ${Mili_LIBRARY} )
SET( Mili_FOUND "YES" )
ENDIF(Mili_LIBRARY)
ENDIF(Mili_INCLUDE_DIR)
IF(Mili_FIND_REQUIRED AND NOT Mili_FOUND)
message(SEND_ERROR "Unable to find the requested Mili libraries.")
ENDIF(Mili_FIND_REQUIRED AND NOT Mili_FOUND)
# handle the QUIETLY and REQUIRED arguments and set Mili_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Mili DEFAULT_MSG Mili_LIBRARY Mili_INCLUDE_DIR)
MARK_AS_ADVANCED(
Mili_INCLUDE_DIR
Mili_LIBRARY
)
......@@ -594,10 +594,10 @@ if(CGNS_FOUND)
endif(CGNS_FOUND)
# Setup Mili
find_package(MILI QUIET)
if(MILI_FOUND)
set(HAVE_LIBMILI ${MILI_FOUND})
endif(MILI_FOUND)
find_package(Mili QUIET)
if(Mili_FOUND)
set(HAVE_LIBMILI ${Mili_FOUND})
endif(Mili_FOUND)
#-----------------------------------------------------------------------------
# Detect packages here. We could probably write macros that we can include from
......
......@@ -121,8 +121,8 @@ Mili Support
To enable Mili readers you will need to set:
```
VISIT_BUILD_READER_Mili
MILI_INCLUDE_DIR
MILI_LIBRARY
Mili_INCLUDE_DIR
Mili_LIBRARY
```
Custom Plugin of VisIt Reader
......
......@@ -149,11 +149,11 @@ visit_include_reader_source(Mili OFF)
if(VISIT_BUILD_READER_Mili)
if(NOT HAVE_LIBMILI)
#if we currently don't have silo setup make it required
find_package(MILI REQUIRED)
find_package(Mili REQUIRED)
endif(NOT HAVE_LIBMILI)
if(NOT MILI_FOUND)
if(NOT Mili_FOUND)
message(FATAL_ERROR "Unable to locate Mili library.")
endif(NOT MILI_FOUND)
endif(NOT Mili_FOUND)
endif(VISIT_BUILD_READER_Mili)
#-----------------------------------------------------------------------------
......@@ -181,7 +181,7 @@ if(HAVE_LIBCGNS AND VISIT_BUILD_READER_CGNS)
endif(HAVE_LIBCGNS AND VISIT_BUILD_READER_CGNS)
if(HAVE_LIBMILI AND VISIT_BUILD_READER_Mili)
include_directories(${MILI_INCLUDE_DIR})
include_directories(${Mili_INCLUDE_DIR})
endif(HAVE_LIBMILI AND VISIT_BUILD_READER_Mili)
set(Module_SRCS
......@@ -230,7 +230,7 @@ if(HAVE_LIBCGNS AND VISIT_BUILD_READER_CGNS)
endif(HAVE_LIBCGNS AND VISIT_BUILD_READER_CGNS)
if(HAVE_LIBMILI AND VISIT_BUILD_READER_Mili)
target_link_libraries(vtkIOVisItBridge LINK_PRIVATE ${MILI_LIBRARIES})
target_link_libraries(vtkIOVisItBridge LINK_PRIVATE ${Mili_LIBRARIES})
endif(HAVE_LIBMILI AND VISIT_BUILD_READER_Mili)
if (VISIT_BUILD_READER_GMV)
......
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