From b0c1fba0d8021d51873e2641215e5e52f51e71b8 Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 2 Jul 2013 13:26:58 +0000 Subject: [PATCH] Preparation of the SALOME7.2.0 win32 version. --- adm_local/cmake_files/FindNETGEN.cmake | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/adm_local/cmake_files/FindNETGEN.cmake b/adm_local/cmake_files/FindNETGEN.cmake index 05e49a8..25a07df 100644 --- a/adm_local/cmake_files/FindNETGEN.cmake +++ b/adm_local/cmake_files/FindNETGEN.cmake @@ -25,11 +25,11 @@ SET(NETGEN_INCLUDES ${NETGEN_INCLUDES} -DNO_PARALLEL_THREADS -DOCCGEOMETRY) SET(NETGEN_LIBS) 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_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_gprim gprim PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) FIND_LIBRARY(NETGEN_LIB_interface interface PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) -#FIND_LIBRARY(NETGEN_LIB_la la 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_occ occ PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) FIND_LIBRARY(NETGEN_LIB_stl stl PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LINUX) @@ -37,11 +37,11 @@ FIND_LIBRARY(NETGEN_LIB_nglib nglib PATHS ${NETGENHOME}/lib ${NETGENHOME}/lib/LI FOREACH(LIBNAME ${NETGEN_LIB_csg} -# ${NETGEN_LIB_gen} + ${NETGEN_LIB_gen} ${NETGEN_LIB_geom2d} -# ${NETGEN_LIB_gprim} + ${NETGEN_LIB_gprim} ${NETGEN_LIB_interface} -# ${NETGEN_LIB_la} + ${NETGEN_LIB_la} ${NETGEN_LIB_mesh} ${NETGEN_LIB_occ} ${NETGEN_LIB_stl} @@ -70,11 +70,16 @@ FILE(WRITE ${tmp_check_netgen} "return 0; \n" "} \n" ) +IF(WINDOWS) + STRING(REPLACE "\\" "/" CAS_CPPFLAGS_TMP ${CAS_CPPFLAGS}) + STRING(REPLACE "\\" "/" NETGEN_INCLUDES_TMP ${NETGEN_INCLUDES}) +ENDIF(WINDOWS) + TRY_COMPILE(NETGEN_V5 ${CMAKE_BINARY_DIR} ${tmp_check_netgen} CMAKE_FLAGS "-DLINK_LIBRARIES:STRING=${NETGEN_LIB_nglib}" - COMPILE_DEFINITIONS ${CAS_CPPFLAGS} ${NETGEN_INCLUDES} + COMPILE_DEFINITIONS ${CAS_CPPFLAGS_TMP} ${NETGEN_INCLUDES_TMP} OUTPUT_VARIABLE OUTPUT ) FILE(REMOVE ${tmp_check_netgen}) -- 2.39.2