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
/
ModuleBase
/
CMakeLists.txt
diff --git
a/src/ModuleBase/CMakeLists.txt
b/src/ModuleBase/CMakeLists.txt
index 2e706ecb97b695885fb0c0062393195d865eb21c..7fa463bdc6b72aae0baa47c191d813209843259c 100644
(file)
--- a/
src/ModuleBase/CMakeLists.txt
+++ b/
src/ModuleBase/CMakeLists.txt
@@
-2,33
+2,46
@@
INCLUDE(Common)
SET(CMAKE_AUTOMOC ON)
SET(PROJECT_HEADERS
SET(CMAKE_AUTOMOC ON)
SET(PROJECT_HEADERS
- ModuleBase.h
+
ModuleBase.h
ModuleBase_IOperation.h
ModuleBase_Operation.h
ModuleBase_OperationDescription.h
ModuleBase_IOperation.h
ModuleBase_Operation.h
ModuleBase_OperationDescription.h
- ModuleBase_PropPanelOperation.h
ModuleBase_ModelWidget.h
ModuleBase_ModelWidget.h
+ ModuleBase_WidgetBoolValue.h
+ ModuleBase_WidgetDoubleValue.h
+ ModuleBase_WidgetEditor.h
ModuleBase_WidgetFactory.h
ModuleBase_WidgetFactory.h
+ ModuleBase_WidgetFeature.h
ModuleBase_WidgetPoint2D.h
ModuleBase_WidgetSwitch.h
ModuleBase_WidgetPoint2D.h
ModuleBase_WidgetSwitch.h
- ModuleBase_MetaWidget.h
+ ModuleBase_WidgetSelector.h
+ ModuleBase_IWorkshop.h
+ ModuleBase_WidgetPoint2dDistance.h
)
SET(PROJECT_SOURCES
ModuleBase_IOperation.cpp
ModuleBase_Operation.cpp
ModuleBase_OperationDescription.cpp
)
SET(PROJECT_SOURCES
ModuleBase_IOperation.cpp
ModuleBase_Operation.cpp
ModuleBase_OperationDescription.cpp
- ModuleBase_PropPanelOperation.cpp
+ ModuleBase_ModelWidget.cpp
+ ModuleBase_WidgetBoolValue.cpp
+ ModuleBase_WidgetDoubleValue.cpp
+ ModuleBase_WidgetEditor.cpp
ModuleBase_WidgetFactory.cpp
ModuleBase_WidgetFactory.cpp
+ ModuleBase_WidgetFeature.cpp
ModuleBase_WidgetPoint2D.cpp
ModuleBase_WidgetSwitch.cpp
ModuleBase_WidgetPoint2D.cpp
ModuleBase_WidgetSwitch.cpp
- ModuleBase_MetaWidget.cpp
+ ModuleBase_WidgetSelector.cpp
+ ModuleBase_WidgetPoint2dDistance.cpp
)
SET(PROJECT_LIBRARIES
Config
ModelAPI
)
SET(PROJECT_LIBRARIES
Config
ModelAPI
+ GeomAPI
${QT_LIBRARIES}
${QT_LIBRARIES}
+ ${CAS_VIEWER}
+ ${CAS_KERNEL}
)
SET(PROJECT_AUTOMOC
)
SET(PROJECT_AUTOMOC
@@
-42,13
+55,17
@@
SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESO
#SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES})
INCLUDE_DIRECTORIES(
#SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES})
INCLUDE_DIRECTORIES(
- ${PROJECT_SOURCE_DIR}/src/Config
+ ${CAS_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/src/Config
+ ${CMAKE_SOURCE_DIR}/src/Events
+ ${CMAKE_SOURCE_DIR}/src/Model
${CMAKE_SOURCE_DIR}/src/ModelAPI
${CMAKE_SOURCE_DIR}/src/GeomDataAPI
${CMAKE_SOURCE_DIR}/src/ModelAPI
${CMAKE_SOURCE_DIR}/src/GeomDataAPI
+ ${CMAKE_SOURCE_DIR}/src/GeomAPI
)
)
-ADD_DEFINITIONS(-DMODULEBASE_EXPORTS)
+ADD_DEFINITIONS(-DMODULEBASE_EXPORTS
${CAS_DEFINITIONS}
)
ADD_LIBRARY(ModuleBase SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
ADD_LIBRARY(ModuleBase SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
-TARGET_LINK_LIBRARIES(ModuleBase ${PROJECT_LIBRARIES})
+TARGET_LINK_LIBRARIES(ModuleBase
GeomAPI
${PROJECT_LIBRARIES})
INSTALL(TARGETS ModuleBase DESTINATION bin)
INSTALL(TARGETS ModuleBase DESTINATION bin)