Move PronounceDict class into service, rather than public interface

Author: pete-woods

src/libunityvoice/CMakeLists.txt

@@ -6,8 +6,7 @@ set(
 )
 
 set(
-        LIB_UNITY_VOICE_SOURCES
-        PronounceDict.cpp
+	LIB_UNITY_VOICE_SOURCES
 	UnityVoice.cpp
 )
 

src/service/CMakeLists.txt

@@ -1,8 +1,13 @@
 
+#########################################
+# Service library
+#########################################
+
 set(
-        UNITY_VOICE_SOURCES
-        VoiceService.cpp
-        main.cpp
+	UNITY_VOICE_SOURCES
+	PronounceDict.cpp
+	VoiceService.cpp
+	main.cpp
 )
 
 qt5_add_dbus_adaptor(
@@ -13,8 +18,9 @@ qt5_add_dbus_adaptor(
 	VoiceAdaptor
 )
 
-add_executable(
+add_library(
 	unity-voice-service
+	STATIC
 	${UNITY_VOICE_SOURCES}
 )
 
@@ -26,11 +32,35 @@ qt5_use_modules(
 
 target_link_libraries(
 	unity-voice-service
-        unityvoice
 	${POCKETSPHINX_LIBRARIES}
 )
 
+#########################################
+# Service binary
+#########################################
+
+add_executable(
+	unity-voice-service-bin
+	${UNITY_VOICE_SOURCES}
+)
+
+set_target_properties(
+	unity-voice-service-bin
+	PROPERTIES
+	OUTPUT_NAME "unity-voice-service"
+)
+
+target_link_libraries(
+	unity-voice-service-bin
+	unity-voice-service
+)
+
+qt5_use_modules(
+	unity-voice-service-bin
+	Core
+)
+
 install(
-	TARGETS unity-voice-service
+	TARGETS unity-voice-service-bin
 	RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}
 )

src/libunityvoice/PronounceDict.cpp renamed to src/service/PronounceDict.cpp

@@ -19,7 +19,7 @@
 #ifndef VOICESERVICE_H_
 #define VOICESERVICE_H_
 
-#include <libunityvoice/PronounceDict.h>
+#include <service/PronounceDict.h>
 
 #include <QList>
 #include <QString>

src/libunityvoice/PronounceDict.h renamed to src/service/PronounceDict.h

@@ -19,7 +19,7 @@ add_definitions(-DPRONOUCE_DICT_HTK="${CMAKE_CURRENT_SOURCE_DIR}/data/test-prono
 
 set(
 	UNIT_TESTS_SRC
-        TestPronounceDict.cpp
+	TestPronounceDict.cpp
 	TestVoiceService.cpp
 	main.cpp
 )
@@ -39,6 +39,7 @@ qt5_use_modules(
 target_link_libraries(
 	unit-tests
 	unityvoice
+	unity-voice-service
 	${POCKETSPHINX_LIBRARIES}
 	${QTDBUSTEST_LIBRARIES}
 	${GTEST_LIBRARIES}