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
Editing lines by points dragging
[modules/shaper.git]
/
src
/
PartSet
/
CMakeLists.txt
diff --git
a/src/PartSet/CMakeLists.txt
b/src/PartSet/CMakeLists.txt
index 3744b2d4c831579b16370f16a1d6ed53b0ddb8e0..c313a6ec9ab9434d2136ba1ad98fa809dd09a90e 100644
(file)
--- a/
src/PartSet/CMakeLists.txt
+++ b/
src/PartSet/CMakeLists.txt
@@
-1,34
+1,40
@@
INCLUDE(Common)
INCLUDE(Common)
-INCLUDE(FindCAS)
SET(CMAKE_AUTOMOC ON)
SET(PROJECT_HEADERS
PartSet.h
SET(CMAKE_AUTOMOC ON)
SET(PROJECT_HEADERS
PartSet.h
- PartSet_Listener.h
+ PartSet_Constants.h
+ PartSet_EditLine.h
PartSet_Module.h
PartSet_Module.h
- PartSet_OperationSketchBase.h
- PartSet_OperationSketch.h
- PartSet_OperationSketchLine.h
PartSet_Tools.h
PartSet_Tools.h
+ PartSet_WidgetSketchLabel.h
+ PartSet_Validators.h
+ PartSet_WidgetPoint2d.h
+ PartSet_WidgetPoint2dDistance.h
+ PartSet_WidgetShapeSelector.h
+ PartSet_OperationSketch.h
)
SET(PROJECT_SOURCES
)
SET(PROJECT_SOURCES
- PartSet_
Listener
.cpp
+ PartSet_
EditLine
.cpp
PartSet_Module.cpp
PartSet_Module.cpp
- PartSet_OperationSketchBase.cpp
- PartSet_OperationSketch.cpp
- PartSet_OperationSketchLine.cpp
PartSet_Tools.cpp
PartSet_Tools.cpp
+ PartSet_WidgetSketchLabel.cpp
+ PartSet_Validators.cpp
+ PartSet_WidgetPoint2d.cpp
+ PartSet_WidgetPoint2dDistance.cpp
+ PartSet_WidgetShapeSelector.cpp
+ PartSet_OperationSketch.cpp
)
SET(PROJECT_RESOURCES
PartSet_icons.qrc
)
)
SET(PROJECT_RESOURCES
PartSet_icons.qrc
)
-SET(TEXT_RESOURCES
-
PartSet_msg_en
.ts
-)
+
#
SET(TEXT_RESOURCES
+
# PartSet_msg_fr
.ts
+
#
)
SET(PROJECT_LIBRARIES
ModuleBase
SET(PROJECT_LIBRARIES
ModuleBase
@@
-36,6
+42,7
@@
SET(PROJECT_LIBRARIES
GeomAPI
${QT_LIBRARIES}
${CAS_KERNEL}
GeomAPI
${QT_LIBRARIES}
${CAS_KERNEL}
+ ${CAS_SHAPE}
)
SET(PROJECT_AUTOMOC
)
SET(PROJECT_AUTOMOC
@@
-43,15
+50,21
@@
SET(PROJECT_AUTOMOC
)
QT4_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
)
QT4_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
-QT4_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES})
+#QT4_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES})
+#QT4_CREATE_TRANSLATION(QM_RESOURCES
+# ${PROJECT_SOURCES}
+# ${TEXT_RESOURCES}
+# OPTIONS -extensions cpp -no-recursive
+# )
-SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES})
-SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES})
+#SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES})
+SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES})
+#SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES})
+SOURCE_GROUP ("Resource Files" FILES ${PROJECT_RESOURCES})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/XGUI
${CMAKE_SOURCE_DIR}/src/Config
${CMAKE_SOURCE_DIR}/src/Events
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/XGUI
${CMAKE_SOURCE_DIR}/src/Config
${CMAKE_SOURCE_DIR}/src/Events
- ${CMAKE_SOURCE_DIR}/src/Model
${CMAKE_SOURCE_DIR}/src/ModuleBase
${CMAKE_SOURCE_DIR}/src/ModelAPI
${CMAKE_SOURCE_DIR}/src/GeomDataAPI
${CMAKE_SOURCE_DIR}/src/ModuleBase
${CMAKE_SOURCE_DIR}/src/ModelAPI
${CMAKE_SOURCE_DIR}/src/GeomDataAPI
@@
-59,6
+72,7
@@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/XGUI
${CMAKE_SOURCE_DIR}/src/SketchPlugin
${CMAKE_SOURCE_DIR}/src/GeomAPI
${CAS_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/src/SketchPlugin
${CMAKE_SOURCE_DIR}/src/GeomAPI
${CAS_INCLUDE_DIRS}
+ ${SUIT_INCLUDE}
)
ADD_DEFINITIONS(-DPARTSET_EXPORTS ${CAS_DEFINITIONS})
)
ADD_DEFINITIONS(-DPARTSET_EXPORTS ${CAS_DEFINITIONS})
@@
-66,8
+80,8
@@
ADD_LIBRARY(PartSet SHARED
${PROJECT_SOURCES}
${PROJECT_HEADERS}
${PROJECT_COMPILED_RESOURCES}
${PROJECT_SOURCES}
${PROJECT_HEADERS}
${PROJECT_COMPILED_RESOURCES}
-
${TEXT_RESOURCES}
-
${QM_RESOURCES}
+
#
${TEXT_RESOURCES}
+
#
${QM_RESOURCES}
)
# The Qt5Widgets_LIBRARIES variable also includes QtGui and QtCore
)
# The Qt5Widgets_LIBRARIES variable also includes QtGui and QtCore
@@
-76,3
+90,4
@@
TARGET_LINK_LIBRARIES(PartSet ${PROJECT_LIBRARIES} XGUI ModelAPI GeomAlgoAPI)
ADD_DEPENDENCIES(PartSet ModuleBase)
INSTALL(TARGETS PartSet DESTINATION bin)
ADD_DEPENDENCIES(PartSet ModuleBase)
INSTALL(TARGETS PartSet DESTINATION bin)
+#INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)