From: Nicolas RECHATIN <nicolas.rechatin@cea.fr>
Date: Fri, 16 Sep 2022 06:50:53 +0000 (+0200)
Subject: Merge branch 'nrn/OPERA_990' into OPERA
X-Git-Tag: OPERA_v0.5-s990~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=66766735be77048679102386910fb0158a6bfc10;p=modules%2Fshaper.git

Merge branch 'nrn/OPERA_990' into OPERA
---

66766735be77048679102386910fb0158a6bfc10
diff --cc src/GeomAlgoAPI/CMakeLists.txt
index eec42e1bd,964443c46..c28837036
--- a/src/GeomAlgoAPI/CMakeLists.txt
+++ b/src/GeomAlgoAPI/CMakeLists.txt
@@@ -94,9 -92,9 +94,10 @@@ SET(PROJECT_HEADER
      GeomAlgoAPI_Defeaturing.h
      GeomAlgoAPI_BoundingBox.h
      GeomAlgoAPI_NormalToFace.h
-     GeomAlgoAPI_Tube.h
      GeomAlgoAPI_ShapeInfo.h
- 	GeomAlgoAPI_CanonicalRecognition.h
+     GeomAlgoAPI_Tube.h
+     GeomAlgoAPI_ROOTExport.h
++	  GeomAlgoAPI_CanonicalRecognition.h
  )
  
  SET(PROJECT_SOURCES
@@@ -170,9 -166,9 +171,11 @@@
      GeomAlgoAPI_Defeaturing.cpp
      GeomAlgoAPI_BoundingBox.cpp
      GeomAlgoAPI_NormalToFace.cpp
 +    GeomAlgoAPI_Tube.cpp
      GeomAlgoAPI_ShapeInfo.cpp
+     GeomAlgoAPI_Tube.cpp
+     GeomAlgoAPI_ROOTExport.cpp
 +	GeomAlgoAPI_CanonicalRecognition.cpp
  )
  
  SET(PROJECT_LIBRARIES