Merge remote-tracking branch 'remotes/origin/master' into SketchSolver

[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
-  resources/PyConsole_msg_en.ts
-  resources/PyConsole_msg_fr.ts
-  resources/PyConsole_msg_ja.ts
+  PyConsole_msg_fr.ts
 )
+
 # sources / static
 SET(PROJECT_SOURCES
-  PyConsole_Console.cxx
-  PyConsole_Editor.cxx
-  PyConsole_EnhEditor.cxx
-  PyConsole_EnhInterp.cxx
-  PyConsole_Event.cxx
-  PyConsole_Interp.cxx
-  PyConsole_Request.cxx
+  PyConsole_Console.cpp
+  PyConsole_Editor.cpp
+  PyConsole_EnhEditor.cpp
+  PyConsole_EnhInterp.cpp
+  PyConsole_Event.cpp
+  PyConsole_Interp.cpp
+  PyConsole_Request.cpp
 )
 
 SET(PROJECT_LIBRARIES
@@ -40,7 +39,12 @@ SET(PROJECT_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})
 
@@ -51,7 +55,7 @@ INCLUDE_DIRECTORIES(
 
 ADD_DEFINITIONS(-DPYCONSOLE_EXPORTS -DHAVE_DEBUG_PYTHON)
 
-ADD_LIBRARY(PyConsole STATIC
+ADD_LIBRARY(PyConsole SHARED
        ${PROJECT_HEADERS}
        ${PROJECT_SOURCES}
        ${TEXT_RESOURCES} 
@@ -60,6 +64,7 @@ ADD_LIBRARY(PyConsole STATIC
 
 TARGET_LINK_LIBRARIES(PyConsole ${PROJECT_LIBRARIES})
 
-#INSTALL(TARGETS PyConsole DESTINATION bin)
+INSTALL(TARGETS PyConsole DESTINATION bin)
+INSTALL(FILES ${QM_RESOURCES} DESTINATION bin)