Merge from V6_main 28/02/2013

[plugins/netgenplugin.git] / adm_local / cmake_files / FindNETGEN.cmake

diff --git a/adm_local/cmake_files/FindNETGEN.cmake b/adm_local/cmake_files/FindNETGEN.cmake
index 65dc9ee400dc830284d31dbcb5354fadf1b1fd9b..1b2209fb8515688862b2dc55eb32390d37f20948 100644 (file)
--- a/adm_local/cmake_files/FindNETGEN.cmake
+++ b/adm_local/cmake_files/FindNETGEN.cmake
@@ -20,21 +20,20 @@
 SET(NETGENHOME $ENV{NETGENHOME})
 FIND_PATH(NETGEN_INCLUDES_DIR nglib.h ${NETGENHOME}/include)
 SET(NETGEN_INCLUDES)
-SET(NETGEN_INCLUDES ${NETGEN_INCLUDES} -I${NETGEN_INCLUDES_DIR})
+SET(NETGEN_INCLUDES ${NETGEN_INCLUDES} -I${NETGEN_INCLUDES_DIR} -I${NETGENHOME}/share/netgen/include)
 SET(NETGEN_INCLUDES ${NETGEN_INCLUDES} -DNO_PARALLEL_THREADS -DOCCGEOMETRY)
 
 FIND_LIBRARY(NETGEN_LIB_nglib nglib PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX)
 
-IF(NETGEN_LIB_nglib)
-  SET(NETGEN_NEW ON)
-  SET(NETGEN_INCLUDES ${NETGEN_INCLUDES} -I${NETGENHOME}/share/netgen/include -DNETGEN_NEW)
-ELSE(NETGEN_LIB_nglib)
-  SET(NETGEN_NEW OFF)
-ENDIF(NETGEN_LIB_nglib)
+# temporary, check to be added later
+SET(NETGEN_V5 OFF)
 
-IF(NETGEN_NEW)
-  SET(NETGEN_LIBS)
-  IF(WINDOWS)
+IF(NETGEN_V5)
+  SET(NETGEN_INCLUDES ${NETGEN_INCLUDES} -DNETGEN_V5)
+ENDIF(NETGEN_V5)
+
+SET(NETGEN_LIBS)
+IF(WINDOWS)
   FIND_LIBRARY(NETGEN_LIB_csg csg PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX)
   FIND_LIBRARY(NETGEN_LIB_gen gen PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX)
   FIND_LIBRARY(NETGEN_LIB_geom2d geom2d PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX)
@@ -53,30 +52,5 @@ IF(NETGEN_NEW)
   SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_mesh})
   SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_occ})
   SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_stl})
-  ENDIF(WINDOWS)
-  SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_nglib})
-ELSE(NETGEN_NEW)
-  FIND_LIBRARY(NETGEN_LIB_csg csg PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX)
-  FIND_LIBRARY(NETGEN_LIB_gen gen PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX)
-  FIND_LIBRARY(NETGEN_LIB_geom2d geom2d PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX)
-  FIND_LIBRARY(NETGEN_LIB_gprim gprim PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX)
-  FIND_LIBRARY(NETGEN_LIB_la la PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX)
-  FIND_LIBRARY(NETGEN_LIB_mesh mesh PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX)
-  FIND_LIBRARY(NETGEN_LIB_nginterface nginterface PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX)
-  FIND_LIBRARY(NETGEN_LIB_occ occ PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX)
-  FIND_LIBRARY(NETGEN_LIB_opti opti PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX)
-  FIND_LIBRARY(NETGEN_LIB_stlgeom stlgeom PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX)
-  SET(NETGEN_LIBS)
-  SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_csg})
-  SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_gen})
-  SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_geom2d})
-  SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_gprim})
-  SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_la})
-  SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_mesh})
-  SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_nginterface})
-  SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_occ})
-  SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_opti})
-  SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_stlgeom})
-ENDIF(NETGEN_NEW)
-
-SET(CMAKE_BUILD 1)
+ENDIF(WINDOWS)
+SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_nglib})