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 'master' of newgeom:newgeom
[modules/shaper.git]
/
src
/
NewGeom
/
CMakeLists.txt
diff --git
a/src/NewGeom/CMakeLists.txt
b/src/NewGeom/CMakeLists.txt
index 0f41fea7f82c7fd3922340cb876babf2055c1852..dcc5bdae5f8d38b2d72bec640556f748019309c3 100644
(file)
--- a/
src/NewGeom/CMakeLists.txt
+++ b/
src/NewGeom/CMakeLists.txt
@@
-1,6
+1,4
@@
-INCLUDE(FindCAS)
-
SET(CMAKE_AUTOMOC ON)
SET(PROJECT_HEADERS
SET(CMAKE_AUTOMOC ON)
SET(PROJECT_HEADERS
@@
-24,6
+22,7
@@
SET(PROJECT_SOURCES
SET(PROJECT_RESOURCES
resources/LightApp.xml
SET(PROJECT_RESOURCES
resources/LightApp.xml
+ resources/SalomeApp.xml
resources/newgeom.png
)
resources/newgeom.png
)
@@
-31,12
+30,15
@@
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} )
)
ADD_DEFINITIONS( -DNewGeom_EXPORTS ${CAS_DEFINITIONS} )
@@
-44,6
+46,8
@@
ADD_DEFINITIONS( -DNewGeom_EXPORTS ${CAS_DEFINITIONS} )
INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI
${PROJECT_SOURCE_DIR}/src/Events
${PROJECT_SOURCE_DIR}/src/ModuleBase
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/Config
${SALOME_GUI_INCLUDE}
${SALOME_KERNEL_INCLUDE}
${CAS_INCLUDE_DIRS}
${SALOME_GUI_INCLUDE}
${SALOME_KERNEL_INCLUDE}
${CAS_INCLUDE_DIRS}
@@
-60,4
+64,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 )