From: ana Date: Fri, 25 Nov 2016 14:22:12 +0000 (+0300) Subject: Windows compatibility. X-Git-Tag: V8_2_0rc2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9db7230375f7e54c29d6baa6e1bb166d1c205356;p=tools%2Fconfiguration.git Windows compatibility. --- diff --git a/cmake/FindNetgen.cmake b/cmake/FindNetgen.cmake index 7995fba..380b6a9 100644 --- a/cmake/FindNetgen.cmake +++ b/cmake/FindNetgen.cmake @@ -41,8 +41,20 @@ IF(NETGEN_ROOT_DIR) LIST(APPEND CMAKE_PREFIX_PATH "${NETGEN_ROOT_DIR}") ENDIF(NETGEN_ROOT_DIR) +# Windows specific stuff: +# Since netgen-5.3.1 uses zlib, try to detect it +IF(WIN32) + IF(EXISTS ${NETGEN_ROOT_DIR}/cmake/FindZlib.cmake) + FILE(TO_CMAKE_PATH ${NETGEN_ROOT_DIR}/cmake NETGEN_CMAKE_FILES) + LIST(APPEND CMAKE_MODULE_PATH ${NETGEN_CMAKE_FILES}) + SET(ZLIB_ROOT_DIR $ENV{ZLIB_ROOT_DIR}) + MESSAGE("RNV ${ZLIB_ROOT_DIR}") + INCLUDE(FindZlib) + ENDIF() +ENDIF() + FIND_PATH(_netgen_base_inc_dir nglib.h) -SET(NETGEN_INCLUDE_DIRS ${_netgen_base_inc_dir}) +SET(NETGEN_INCLUDE_DIRS ${_netgen_base_inc_dir} ${ZLIB_INCLUDE_DIRS}) FIND_PATH(_netgen_add_inc_dir occgeom.hpp HINTS ${_netgen_base_inc_dir} PATH_SUFFIXES share/netgen/include) LIST(APPEND NETGEN_INCLUDE_DIRS ${_netgen_add_inc_dir}) LIST(REMOVE_DUPLICATES NETGEN_INCLUDE_DIRS)