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
/
PyConsole
/
CMakeLists.txt
diff --git
a/src/PyConsole/CMakeLists.txt
b/src/PyConsole/CMakeLists.txt
index 8cd815158e043db3616e0ac0f5528f839aa20a16..aa79a1dc457df7693cd6e73f14719b64ac71a2bd 100644
(file)
--- a/
src/PyConsole/CMakeLists.txt
+++ b/
src/PyConsole/CMakeLists.txt
@@
-19,19
+19,18
@@
SET(PROJECT_AUTOMOC
# resource files / to be processed by lrelease
SET(TEXT_RESOURCES
# resource files / to be processed by lrelease
SET(TEXT_RESOURCES
- resources/PyConsole_msg_en.ts
- resources/PyConsole_msg_fr.ts
- resources/PyConsole_msg_ja.ts
+ PyConsole_msg_fr.ts
)
)
+
# sources / static
SET(PROJECT_SOURCES
# sources / static
SET(PROJECT_SOURCES
- PyConsole_Console.c
xx
- PyConsole_Editor.c
xx
- PyConsole_EnhEditor.c
xx
- PyConsole_EnhInterp.c
xx
- PyConsole_Event.c
xx
- PyConsole_Interp.c
xx
- PyConsole_Request.c
xx
+ PyConsole_Console.c
pp
+ PyConsole_Editor.c
pp
+ PyConsole_EnhEditor.c
pp
+ PyConsole_EnhInterp.c
pp
+ PyConsole_Event.c
pp
+ PyConsole_Interp.c
pp
+ PyConsole_Request.c
pp
)
SET(PROJECT_LIBRARIES
)
SET(PROJECT_LIBRARIES
@@
-40,7
+39,12
@@
SET(PROJECT_LIBRARIES
${PYTHON_LIBRARIES}
)
${PYTHON_LIBRARIES}
)
-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} ${QM_RESOURCES})
SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${QM_RESOURCES})
@@
-51,7
+55,7
@@
INCLUDE_DIRECTORIES(
ADD_DEFINITIONS(-DPYCONSOLE_EXPORTS -DHAVE_DEBUG_PYTHON)
ADD_DEFINITIONS(-DPYCONSOLE_EXPORTS -DHAVE_DEBUG_PYTHON)
-ADD_LIBRARY(PyConsole S
TATIC
+ADD_LIBRARY(PyConsole S
HARED
${PROJECT_HEADERS}
${PROJECT_SOURCES}
${TEXT_RESOURCES}
${PROJECT_HEADERS}
${PROJECT_SOURCES}
${TEXT_RESOURCES}
@@
-60,6
+64,7
@@
ADD_LIBRARY(PyConsole STATIC
TARGET_LINK_LIBRARIES(PyConsole ${PROJECT_LIBRARIES})
TARGET_LINK_LIBRARIES(PyConsole ${PROJECT_LIBRARIES})
-#INSTALL(TARGETS PyConsole DESTINATION bin)
+INSTALL(TARGETS PyConsole DESTINATION bin)
+INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)