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.2.0' of newgeom:newgeom into Dev_1.2.0
[modules/shaper.git]
/
src
/
NewGeom
/
CMakeLists.txt
diff --git
a/src/NewGeom/CMakeLists.txt
b/src/NewGeom/CMakeLists.txt
index 31e82979299a5a97450fa5335e95cf26314e2ba8..70f406e6f2382ef1a90a421d83e82b1efa380b93 100644
(file)
--- a/
src/NewGeom/CMakeLists.txt
+++ b/
src/NewGeom/CMakeLists.txt
@@
-1,5
+1,5
@@
+## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-INCLUDE(FindCAS)
SET(CMAKE_AUTOMOC ON)
SET(CMAKE_AUTOMOC ON)
@@
-9,6
+9,7
@@
SET(PROJECT_HEADERS
NewGeom_DataModel.h
NewGeom_OCCSelector.h
NewGeom_SalomeViewer.h
NewGeom_DataModel.h
NewGeom_OCCSelector.h
NewGeom_SalomeViewer.h
+ NewGeom_NestedButton.h
)
SET(PROJECT_AUTOMOC
)
SET(PROJECT_AUTOMOC
@@
-20,10
+21,12
@@
SET(PROJECT_SOURCES
NewGeom_DataModel.cpp
NewGeom_OCCSelector.cpp
NewGeom_SalomeViewer.cpp
NewGeom_DataModel.cpp
NewGeom_OCCSelector.cpp
NewGeom_SalomeViewer.cpp
+ NewGeom_NestedButton.cpp
)
SET(PROJECT_RESOURCES
resources/LightApp.xml
)
SET(PROJECT_RESOURCES
resources/LightApp.xml
+ resources/SalomeApp.xml
resources/newgeom.png
)
resources/newgeom.png
)
@@
-31,18
+34,25
@@
SET(PROJECT_LIBRARIES
Events
Config
XGUI
Events
Config
XGUI
+ ModuleBase
${QT_LIBRARIES}
${suit}
${std}
${LightApp}
${CAM}
${OCCViewer}
${QT_LIBRARIES}
${suit}
${std}
${LightApp}
${CAM}
${OCCViewer}
+ ${qtx}
+ ${CAS_SHAPE}
)
ADD_DEFINITIONS( -DNewGeom_EXPORTS ${CAS_DEFINITIONS} )
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI
${PROJECT_SOURCE_DIR}/src/Events
)
ADD_DEFINITIONS( -DNewGeom_EXPORTS ${CAS_DEFINITIONS} )
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI
${PROJECT_SOURCE_DIR}/src/Events
+ ${PROJECT_SOURCE_DIR}/src/ModuleBase
+ ${PROJECT_SOURCE_DIR}/src/ModelAPI
+ ${PROJECT_SOURCE_DIR}/src/GeomAPI
+ ${PROJECT_SOURCE_DIR}/src/Config
${SALOME_GUI_INCLUDE}
${SALOME_KERNEL_INCLUDE}
${CAS_INCLUDE_DIRS}
${SALOME_GUI_INCLUDE}
${SALOME_KERNEL_INCLUDE}
${CAS_INCLUDE_DIRS}
@@
-59,4
+69,4
@@
ADD_DEPENDENCIES(NewGeom XGUI)
TARGET_LINK_LIBRARIES(NewGeom ${PROJECT_LIBRARIES})
INSTALL(TARGETS NewGeom DESTINATION bin)
TARGET_LINK_LIBRARIES(NewGeom ${PROJECT_LIBRARIES})
INSTALL(TARGETS NewGeom DESTINATION bin)
-INSTALL(FILES ${PROJECT_RESOURCES} DESTINATION share/salome/resources/newgeom )
\ No newline at end of file
+INSTALL(FILES ${PROJECT_RESOURCES} DESTINATION share/salome/resources/newgeom )