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]
/
src
/
GeomData
/
CMakeLists.txt
diff --git
a/src/GeomData/CMakeLists.txt
b/src/GeomData/CMakeLists.txt
index 05ee5eb3c7f806995e8d492ae0b96dbf73e70a9b..16a1329d7382314c2ada67edeff0597589ef648c 100644
(file)
--- a/
src/GeomData/CMakeLists.txt
+++ b/
src/GeomData/CMakeLists.txt
@@
-1,24
+1,40
@@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
INCLUDE(Common)
INCLUDE(Common)
-INCLUDE(FindCAS)
SET(PROJECT_HEADERS
GeomData.h
GeomData_Point.h
SET(PROJECT_HEADERS
GeomData.h
GeomData_Point.h
+ GeomData_Dir.h
+ GeomData_Point2D.h
)
SET(PROJECT_SOURCES
GeomData_Point.cpp
)
SET(PROJECT_SOURCES
GeomData_Point.cpp
+ GeomData_Dir.cpp
+ GeomData_Point2D.cpp
+)
+
+SET(PROJECT_LIBRARIES
+ GeomDataAPI
+ ModelAPI
+ GeomAPI
+ Events
+ ${CAS_OCAF}
+ ${CAS_SHAPE}
)
)
-ADD_DEFINITIONS(-DGEOMDATA_EXPORTS ${CAS_DEFINITIONS}
${BOOST_DEFINITIONS}
)
+ADD_DEFINITIONS(-DGEOMDATA_EXPORTS ${CAS_DEFINITIONS})
ADD_LIBRARY(GeomData SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
ADD_LIBRARY(GeomData SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
-TARGET_LINK_LIBRARIES(GeomData ${PROJECT_LIBRARIES}
${CAS_OCAF} ModelAPI Events Config
)
+TARGET_LINK_LIBRARIES(GeomData ${PROJECT_LIBRARIES})
INCLUDE_DIRECTORIES(
../ModelAPI
../GeomDataAPI
INCLUDE_DIRECTORIES(
../ModelAPI
../GeomDataAPI
+ ../GeomAPI
../Events
../Config
../Events
../Config
+ ../Model
${CAS_INCLUDE_DIRS}
)
${CAS_INCLUDE_DIRS}
)