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
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
[modules/shaper.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 0ce69fcb8f4acc7b6bf8c92b7baabd728a07f1dd..ea51439dfafdc64027a31c58cb1a4e4e09503e9f 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-1,6
+1,7
@@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
PROJECT (NewGEOM)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.10)
PROJECT (NewGEOM)
+SET (NewGeom_Version 1.0.0)
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeCommon" ${CMAKE_MODULE_PATH})
@@
-29,8
+30,8
@@
IF(UNIX)
SET(CMAKE_SHARED_LINKER_FLAGS "-lgcov")
SETUP_TARGET_FOR_COVERAGE(test_coverage # Name for custom target.
SET(CMAKE_SHARED_LINKER_FLAGS "-lgcov")
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.
+ ctest # Name of the test driver executable that runs the tests.
+ coverage) # Name of output directory.
ENDIF(USE_TEST_COVERAGE)
#SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -E")
ENDIF(USE_TEST_COVERAGE)
#SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -E")
@@
-39,7
+40,9
@@
IF(UNIX)
ENDIF(CMAKE_COMPILER_IS_GNUCC)
ENDIF(UNIX)
ENDIF(CMAKE_COMPILER_IS_GNUCC)
ENDIF(UNIX)
-
+#IF(CMAKE_BUILD_TYPE MATCHES Release)
+ ADD_SUBDIRECTORY (doc)
+#ENDIF(CMAKE_BUILD_TYPE MATCHES Release)
ADD_SUBDIRECTORY (src/Config)
ADD_SUBDIRECTORY (src/Events)
ADD_SUBDIRECTORY (src/Model)
ADD_SUBDIRECTORY (src/Config)
ADD_SUBDIRECTORY (src/Events)
ADD_SUBDIRECTORY (src/Model)
@@
-61,9
+64,8
@@
ADD_SUBDIRECTORY (src/GeomApp)
ADD_SUBDIRECTORY (src/ExchangePlugin)
ADD_SUBDIRECTORY (src/GeomValidators)
ADD_SUBDIRECTORY (src/ExchangePlugin)
ADD_SUBDIRECTORY (src/GeomValidators)
-
IF(${HAVE_SALOME})
IF(${HAVE_SALOME})
-
ADD_SUBDIRECTORY (src/NewGeom)
+ ADD_SUBDIRECTORY (src/NewGeom)
ADD_SUBDIRECTORY (src/ConnectorPlugin)
ENDIF(${HAVE_SALOME})
ADD_SUBDIRECTORY (src/ConnectorPlugin)
ENDIF(${HAVE_SALOME})