Fix compilation of library & programs

Author: syb0rg

CMakeLists.txt

@@ -8,6 +8,7 @@ PROJECT(${PROJECT_NAME})
 
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 SET_DIRECTORY_PROPERTIES(PROPERTIES EP_PREFIX ${CMAKE_BINARY_DIR}/build-data)
+set(CMAKE_MACOSX_RPATH TRUE)
 
 #
 # Setup compiler flags
@@ -29,17 +30,20 @@ INCLUDE_DIRECTORIES(include)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(test EXCLUDE_FROM_ALL)
 
-ADD_LIBRARY(${PROJECT_NAME} STATIC
+ADD_LIBRARY(${PROJECT_NAME}_static STATIC
 		$<TARGET_OBJECTS:libsphinxad>
         $<TARGET_OBJECTS:fe>
         $<TARGET_OBJECTS:feat>
 		$<TARGET_OBJECTS:lm>
 		$<TARGET_OBJECTS:util>
-		$<TARGET_OBJECTS:sphinx_adtools>
-		$<TARGET_OBJECTS:sphinx_cepview>
-		$<TARGET_OBJECTS:sphinx_fe>
-		$<TARGET_OBJECTS:sphinx_jsgf2fsg>
-		$<TARGET_OBJECTS:sphinx_lmtools>
     )
 
+ADD_LIBRARY(${PROJECT_NAME} SHARED
+        $<TARGET_OBJECTS:libsphinxad>
+        $<TARGET_OBJECTS:fe>
+        $<TARGET_OBJECTS:feat>
+        $<TARGET_OBJECTS:lm>
+        $<TARGET_OBJECTS:util>
+)
+
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${LIBS})

src/sphinx_adtools/CMakeLists.txt

@@ -1,5 +1,12 @@
-SET(SOURCES	cont_seg.c
-			sphinx_pitch.c
+set(PROGRAMS cont_seg
+			sphinx_pitch
 	)
-	
-add_library(sphinx_adtools OBJECT ${SOURCES})
+
+foreach (program ${PROGRAMS})
+    add_executable(${program} ${program})
+    target_link_libraries(${program} ${PROJECT_NAME})
+    set_target_properties (${program}
+                            PROPERTIES
+                            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+endforeach ()

src/sphinx_cepview/CMakeLists.txt

@@ -1,3 +1,10 @@
+set(PROGRAM sphinx_cepview)
+
 SET(SOURCES main_cepview.c)
 
-add_library(sphinx_cepview OBJECT ${SOURCES})
+add_executable(${PROGRAM} ${SOURCES})
+target_link_libraries(${PROGRAM} ${PROJECT_NAME})
+set_target_properties (${PROGRAM}
+                        PROPERTIES
+                        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+)

src/sphinx_fe/CMakeLists.txt

@@ -1,3 +1,9 @@
-SET(SOURCES sphinx_fe.c)
+set(PROGRAM sphinx_fe)
+set(SOURCES sphinx_fe.c)
 
-add_library(sphinx_fe OBJECT ${SOURCES})
+add_executable(${PROGRAM} ${SOURCES})
+target_link_libraries(${PROGRAM} ${PROJECT_NAME})
+set_target_properties (${PROGRAM}
+                        PROPERTIES
+                        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+)

src/sphinx_jsgf2fsg/CMakeLists.txt

@@ -1,3 +1,9 @@
-SET(SOURCES main.c)
+set(PROGRAM sphinx_jsgf2fsg)
+set(SOURCES main.c)
 
-add_library(sphinx_jsgf2fsg OBJECT ${SOURCES})
+add_executable(${PROGRAM} ${SOURCES})
+target_link_libraries(${PROGRAM} ${PROJECT_NAME})
+set_target_properties (${PROGRAM}
+                        PROPERTIES
+                        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+)

src/sphinx_lmtools/CMakeLists.txt

@@ -1,5 +1,12 @@
-SET(SOURCES	sphinx_lm_convert.c
-			sphinx_lm_eval.c
+set(PROGRAMS	sphinx_lm_convert.c
+                sphinx_lm_eval.c
 	)
 
-add_library(sphinx_lmtools OBJECT ${SOURCES})
+foreach (program ${PROGRAMS})
+    add_executable(${program} ${program})
+    target_link_libraries(${program} ${PROJECT_NAME})
+    set_target_properties (${program}
+                            PROPERTIES
+                            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
+    )
+endforeach ()