Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Task 2.3: Improve performance
[modules/shaper.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 2c80c7b302ccdf98f9c089abd3142901d31915b5..dfc3a0edbd7580f71b5eed7faa7b2a195bf5e74c 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-29,7
+29,10
@@
ENDIF(WIN32)
SET (SHAPER_Version 9.3.0)
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
SET (SHAPER_Version 9.3.0)
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
-OPTION(SHAPER_BUILD_DOC "Generate SHAPER documentation" ON)
+
+IF (NOT CADBUILDER_BUILD_DOC)
+ OPTION(SHAPER_BUILD_DOC "Generate SHAPER documentation" ON)
+ENDIF(NOT CADBUILDER_BUILD_DOC)
INCLUDE(SalomeMacros)
INCLUDE(SalomeMacros)
@@
-164,6
+167,7
@@
ADD_SUBDIRECTORY (src/PrimitivesAPI)
ADD_SUBDIRECTORY (src/SketchAPI)
ADD_SUBDIRECTORY (src/GDMLAPI)
ADD_SUBDIRECTORY (src/ConnectorAPI)
ADD_SUBDIRECTORY (src/SketchAPI)
ADD_SUBDIRECTORY (src/GDMLAPI)
ADD_SUBDIRECTORY (src/ConnectorAPI)
+ADD_SUBDIRECTORY (src/FiltersAPI)
# Tests
ADD_SUBDIRECTORY (test.API/SHAPER)
# Tests
ADD_SUBDIRECTORY (test.API/SHAPER)
@@
-184,6
+188,10
@@
IF(ADD_COMPATIBILITY_TESTS)
ADD_CUSTOM_TARGET(run_compatibility_tests COMMAND ${CMAKE_CTEST_COMMAND} -C "${CMAKE_BUILD_TYPE}" -LE "tests_compatibility")
ENDIF(ADD_COMPATIBILITY_TESTS)
ADD_CUSTOM_TARGET(run_compatibility_tests COMMAND ${CMAKE_CTEST_COMMAND} -C "${CMAKE_BUILD_TYPE}" -LE "tests_compatibility")
ENDIF(ADD_COMPATIBILITY_TESTS)
+IF(ADD_HDF_TESTS)
+ ADD_SUBDIRECTORY (test.hdfs)
+ENDIF(ADD_HDF_TESTS)
+
IF(SHAPER_BUILD_DOC)
INCLUDE(FindSphinx)
ADD_SUBDIRECTORY (doc)
IF(SHAPER_BUILD_DOC)
INCLUDE(FindSphinx)
ADD_SUBDIRECTORY (doc)