diff --git a/cMake/FindNETGEN.cmake b/cMake/FindNETGEN.cmake index 7c9563a3dd..7fbf372476 100644 --- a/cMake/FindNETGEN.cmake +++ b/cMake/FindNETGEN.cmake @@ -27,29 +27,7 @@ else(Netgen_FOUND) SET(NETGEN_DEFINITIONS -DNO_PARALLEL_THREADS -DOCCGEOMETRY) - IF(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX) - # We haven't supported Netgen prior to 5.3.1 on MacOS, and the current - # plan is for the next Netgen version to be 6.1 (currently unreleased). - IF(DEFINED HOMEBREW_PREFIX) - SET(NGLIB_PREFIX ${HOMEBREW_PREFIX}) - ELSE(DEFINED HOMEBREW_PREFIX) - SET(NGLIB_PREFIX ${MACPORTS_PREFIX}) - ENDIF(DEFINED HOMEBREW_PREFIX) - - FIND_PATH(NGLIB_INCLUDE_DIR nglib.h ${NGLIB_PREFIX}/include) - - FIND_LIBRARY(NGLIB_LIBNGLIB nglib ${NGLIB_PREFIX}/lib) - FIND_LIBRARY(NGLIB_LIBMESH mesh ${NGLIB_PREFIX}/lib) - FIND_LIBRARY(NGLIB_LIBOCC occ ${NGLIB_PREFIX}/lib) - FIND_LIBRARY(NGLIB_LIBINTERFACE interface ${NGLIB_PREFIX}/lib) - SET(NGLIB_LIBRARIES ${NGLIB_LIBNGLIB} ${NGLIB_LIBMESH} - ${NGLIB_LIBOCC} ${NGLIB_LIBINTERFACE}) - - IF(NOT NETGENDATA) - SET(NETGENDATA ${NGLIB_PREFIX}/include/netgen) - ENDIF(NOT NETGENDATA) - - ELSEIF(WIN32) + IF(WIN32) FIND_PATH(NGLIB_INCLUDE_DIR NAMES nglib.h PATHS ${NETGEN_INCLUDEDIR}) SET(NETGEN_LIBS nglib mesh occ interface) SET(NGLIB_LIBRARIES "") @@ -72,7 +50,7 @@ else(Netgen_FOUND) SET(NETGENDATA netgen) ENDIF(NOT NETGENDATA) - ELSE(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX) + ELSEIF(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX) IF(NETGEN_ROOT) SET(NETGEN_INCLUDEDIR ${NETGEN_ROOT}/include) SET(NETGEN_LIBDIR ${NETGEN_ROOT}/lib) @@ -101,7 +79,6 @@ else(Netgen_FOUND) IF(NOT NETGENDATA) SET(NETGENDATA /usr/share/netgen/libsrc) ENDIF(NOT NETGENDATA) - ENDIF(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX) FIND_PATH(NETGEN_DIR_include NAMES mydefs.hpp NO_DEFAULT_PATH PATHS ${NGLIB_INCLUDE_DIR}/include ${NETGENDATA}/include ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR}) @@ -109,9 +86,7 @@ else(Netgen_FOUND) IF(NOT NGLIB_INCLUDE_DIR AND NOT NETGEN_DIR_include) MESSAGE(STATUS "Cannot find NETGEN header files.") ELSEIF(NOT NETGEN_VERSION) - file(STRINGS ${NETGEN_DIR_include}/mydefs.hpp NETGEN_VERSION - REGEX "#define PACKAGE_VERSION.*" - ) + file(STRINGS ${NETGEN_DIR_include}/mydefs.hpp NETGEN_VERSION REGEX "#define PACKAGE_VERSION.*") ENDIF() IF(NOT NGLIB_LIBRARIES)