]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Allow default paths for opencascade detection 244/head
authorMatthias Maier <tamiko@kyomu.43-1.org>
Wed, 12 Nov 2014 00:37:20 +0000 (01:37 +0100)
committerMatthias Maier <tamiko@kyomu.43-1.org>
Wed, 12 Nov 2014 00:37:20 +0000 (01:37 +0100)
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

index 8e402ade6b23885cb25420cbf876fc9542147746..02f6317811c1041c3082020465763005ec5c16eb 100644 (file)
@@ -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()
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.