Correct processing of the fixed arc in PlaneGCS (issue #1280)

[modules/shaper.git] / src / SketchSolver / CMakeLists.txt

diff --git a/src/SketchSolver/CMakeLists.txt b/src/SketchSolver/CMakeLists.txt
index 89ddc57102b2e5fa488f4fcdc839f9dfdbe6b6a2..8e18f16da387b9314ba5bce708b62bf11d92e2e3 100644 (file)
--- a/src/SketchSolver/CMakeLists.txt
+++ b/src/SketchSolver/CMakeLists.txt
@@ -13,6 +13,7 @@ SET(PROJECT_HEADERS
     SketchSolver_ConstraintLength.h
     SketchSolver_ConstraintMirror.h
     SketchSolver_ConstraintFixed.h
+    SketchSolver_ConstraintFixedArcRadius.h
     SketchSolver_ConstraintTangent.h
     SketchSolver_ConstraintMulti.h
     SketchSolver_ConstraintMultiRotation.h
@@ -37,6 +38,7 @@ SET(PROJECT_SOURCES
     SketchSolver_ConstraintLength.cpp
     SketchSolver_ConstraintMirror.cpp
     SketchSolver_ConstraintFixed.cpp
+    SketchSolver_ConstraintFixedArcRadius.cpp
     SketchSolver_ConstraintTangent.cpp
     SketchSolver_ConstraintMulti.cpp
     SketchSolver_ConstraintMultiRotation.cpp
@@ -53,6 +55,7 @@ SET(PROJECT_LIBRARIES
     Events
     ModelAPI
     GeomAPI
+    GeomDataAPI
 )
 
 INCLUDE_DIRECTORIES(
@@ -76,10 +79,19 @@ INSTALL(TARGETS SketchSolver DESTINATION plugins)
 
 
 # Include specific solvers
-FIND_FILE(SSPath "SolveSpaceSolver/CMakeLists.txt" PATHS "${CMAKE_CURRENT_SOURCE_DIR}")
-STRING(COMPARE NOTEQUAL ${SSPath} "SSPath-NOTFOUND" SSPath_FOUND)
-FIND_FILE(GCSPath "PlainGCSSolver/CMakeLists.txt" PATHS "${CMAKE_CURRENT_SOURCE_DIR}")
-STRING(COMPARE NOTEQUAL ${GCSPath} "GCSPath-NOTFOUND" GCSPath_FOUND)
+IF(NO_SolveSpace)
+  SET(SSPath_FOUND FALSE)
+ELSE()
+  FIND_FILE(SSPath "SolveSpaceSolver/CMakeLists.txt" PATHS "${CMAKE_CURRENT_SOURCE_DIR}")
+  STRING(COMPARE NOTEQUAL ${SSPath} "SSPath-NOTFOUND" SSPath_FOUND)
+ENDIF()
+
+IF(NO_PlaneGCS)
+  SET(GCSPath_FOUND FALSE)
+ELSE()
+  FIND_FILE(GCSPath "PlaneGCSSolver/CMakeLists.txt" PATHS "${CMAKE_CURRENT_SOURCE_DIR}")
+  STRING(COMPARE NOTEQUAL ${GCSPath} "GCSPath-NOTFOUND" GCSPath_FOUND)
+ENDIF()
 
 IF(${SSPath_FOUND} OR ${GCSPath_FOUND})
   IF(${SSPath_FOUND})
@@ -87,8 +99,8 @@ IF(${SSPath_FOUND} OR ${GCSPath_FOUND})
     ADD_SUBDIRECTORY(SolveSpaceSolver)
   ENDIF()
   IF(${GCSPath_FOUND})
-    MESSAGE(STATUS "PlainGCSSolver plugin found in ${GCSPath}")
-    ADD_SUBDIRECTORY(PlainGCSSolver)
+    MESSAGE(STATUS "PlaneGCSSolver plugin found in ${GCSPath}")
+    ADD_SUBDIRECTORY(PlaneGCSSolver)
   ENDIF()
 ELSE()
   MESSAGE(WARNING "No sketch solver plugin is found")