X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=1d1120f84a40d7c0abae8c6ef2db6be0075ab990;hb=724896cd03d18f3581a912a1ae261fa167a09f41;hp=6cfd58728f49cf36fb252188f1613f58cb53ffe2;hpb=ae6b9d759dd155310e263ebd73217de0c73801a7;p=modules%2Fshaper.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 6cfd58728..1d1120f84 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,13 +4,15 @@ PROJECT (NewGEOM) SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH}) +INCLUDE(FindEclipse) INCLUDE(Common) INCLUDE(FindQt) -INCLUDE(FindBoost) INCLUDE(FindPython) INCLUDE(FindSalome) INCLUDE(FindSolveSpace) INCLUDE(FindCAS) +INCLUDE(FindSUIT) + IF(UNIX) IF(CMAKE_COMPILER_IS_GNUCC) @@ -19,7 +21,7 @@ IF(UNIX) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") #Supporting test coverage checks (gcov) in the DEBUG mode - IF(CMAKE_BUILD_TYPE MATCHES Debug) + IF(USE_TEST_COVERAGE) INCLUDE(CodeCoverage) MESSAGE(STATUS "Setting flags for gcov support the the gcc...") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage") @@ -29,7 +31,7 @@ IF(UNIX) SETUP_TARGET_FOR_COVERAGE(test_coverage # Name for custom target. ctest # Name of the test driver executable that runs the tests. coverage) # Name of output directory. - ENDIF(CMAKE_BUILD_TYPE MATCHES Debug) + ENDIF(USE_TEST_COVERAGE) #SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -E") MESSAGE(STATUS "gcc flags are: " ${CMAKE_CXX_FLAGS}) @@ -53,15 +55,14 @@ ADD_SUBDIRECTORY (src/SketchPlugin) ADD_SUBDIRECTORY (src/SketchSolver) ADD_SUBDIRECTORY (src/ModuleBase) ADD_SUBDIRECTORY (src/PartSet) -ADD_SUBDIRECTORY (src/PyConsole) -ADD_SUBDIRECTORY (src/PyEvent) -ADD_SUBDIRECTORY (src/PyInterp) +ADD_SUBDIRECTORY (src/AppElements) ADD_SUBDIRECTORY (src/XGUI) ADD_SUBDIRECTORY (src/GeomApp) +ADD_SUBDIRECTORY (src/ExchangePlugin) +ADD_SUBDIRECTORY (src/GeomValidators) IF(${HAVE_SALOME}) ADD_SUBDIRECTORY (src/NewGeom) ENDIF(${HAVE_SALOME}) -FIND_PACKAGE(PythonInterp REQUIRED) ENABLE_TESTING()