From 5c9cd38c567bbb7753c4b5aca4fc4dc37cbdb692 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 12 Nov 2014 01:37:20 +0100 Subject: [PATCH] Allow default paths for opencascade detection OPENCASCADE_DIR is just a hint and might be invalid. (In FindTRILINOS.cmake the full path is known due to the inclusion of the Trilinos project configuration. Thus, those options ensure that no wrong library is accidentally picked up.) --- cmake/modules/FindOPENCASCADE.cmake | 32 +++-------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/cmake/modules/FindOPENCASCADE.cmake b/cmake/modules/FindOPENCASCADE.cmake index 8e402ade6b..02f6317811 100644 --- a/cmake/modules/FindOPENCASCADE.cmake +++ b/cmake/modules/FindOPENCASCADE.cmake @@ -49,29 +49,9 @@ ENDIF() # These seem to be pretty much the only required ones. SET(_opencascade_libraries - TKFillet - TKMesh - TKernel - TKG2d - TKG3d - TKMath - TKIGES - TKSTL - TKShHealing - TKXSBase - TKBool - TKBO - TKBRep - TKTopAlgo - TKGeomAlgo - TKGeomBase - TKOffset - TKPrim - TKSTEP - TKSTEPBase - TKSTEPAttr - TKHLR - TKFeat + TKBO TKBool TKBRep TKernel TKFeat TKFillet TKG2d TKG3d TKGeomAlgo + TKGeomBase TKHLR TKIGES TKMath TKMesh TKOffset TKPrim TKShHealing TKSTEP + TKSTEPAttr TKSTEPBase TKSTL TKTopAlgo TKXSBase ) SET(_libraries "") @@ -81,12 +61,6 @@ FOREACH(_library ${_opencascade_libraries}) NAMES ${_library} HINTS ${OPENCASCADE_DIR} PATH_SUFFIXES lib${LIB_SUFFIX} lib64 lib - NO_DEFAULT_PATH - NO_CMAKE_ENVIRONMENT_PATH - NO_CMAKE_PATH - NO_SYSTEM_ENVIRONMENT_PATH - NO_CMAKE_SYSTEM_PATH - NO_CMAKE_FIND_ROOT_PATH ) ENDFOREACH() -- 2.39.5