test: Move testapi.c to /test and use a sample file that is not ogg for basic testing.

[vlc] / extras / buildsystem / cmake / CMakeLists / src_CMakeLists.txt

diff --git a/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt b/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
index 802b90bf25d42e6ea640868cbced7f3c0b7eae2e..5d84c5bff3a584bfb9a9b9f57f8993cf0f422ce6 100644 (file)
--- a/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
+++ b/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
@@ -20,7 +20,6 @@ set( SOURCES_libvlc_common
     libvlc-common.c
     libvlc.h
     libvlc-module.c
-    interface/interface.h
     interface/interface.c
     interface/intf_eject.c
     interface/interaction.c
@@ -90,6 +89,7 @@ set( SOURCES_libvlc_common
     text/wincp.c
     text/iso_lang.c
     text/iso-639_def.h
+    misc/action.c
     misc/md5.c
     misc/rand.c
     misc/mtime.c
@@ -107,6 +107,7 @@ set( SOURCES_libvlc_common
     config/core.c
     config/chain.c
     config/file.c
+    config/intf.c
     config/cmdline.c
     misc/events.c
     misc/image.c
@@ -135,8 +136,11 @@ set_target_properties(libvlc PROPERTIES
         OUTPUT_NAME vlc
         SOVERSION 1 VERSION 1.0.0)
 
+if(UPDATE_CHECK)
+target_link_libraries(libvlc ${LIBM} ${LIBRT} ${LIBICONV} ${Dlopen_LIBRARIES} "-lgcrypt")
+else(UPDATE_CHECK)
 target_link_libraries(libvlc ${LIBM} ${LIBRT} ${LIBICONV} ${Dlopen_LIBRARIES})
-
+endif(UPDATE_CHECK)
 
 # libvlc-control
 set( SOURCES_libvlc_control
@@ -147,13 +151,12 @@ set( SOURCES_libvlc_control
      control/vlm.c
      control/video.c
      control/audio.c
-     control/dynamic_media_list.c
      control/event.c
      control/flat_media_list_view.c
      control/hierarchical_media_list_view.c
      control/hierarchical_node_media_list_view.c
-     control/media_descriptor.c
-     control/media_instance.c
+     control/media.c
+     control/media_player.c
      control/media_list.c
      control/media_list_path.h
      control/media_list_player.c
@@ -163,8 +166,7 @@ set( SOURCES_libvlc_control
      control/mediacontrol_core.c
      control/mediacontrol_util.c
      control/mediacontrol_audio_video.c
-     control/media_discoverer.c
-     control/tag_query.c )
+     control/media_discoverer.c )
 
 add_library(libvlc-control SHARED ${SOURCES_libvlc_control})
 
@@ -268,21 +270,18 @@ set_target_properties(libvlc libvlc-control vlc PROPERTIES COMPILE_FLAGS
 ##########################################################
 # Tests
 
-add_executable(testapi    control/testapi.c)
-add_executable(i18n_atof  test/i18n_atof.c)
-add_executable(url        test/url.c)
-add_executable(utf8       test/utf8.c)
-add_executable(dictionary test/dictionary.c)
-
-target_link_libraries(testapi    libvlc-control)
-target_link_libraries(i18n_atof  libvlc)
-target_link_libraries(url        libvlc)
-target_link_libraries(utf8       libvlc)
-target_link_libraries(dictionary libvlc)
-
-add_test(testapi    ${EXECUTABLE_OUTPUT_PATH}/testapi)
-add_test(i18n_atof  ${EXECUTABLE_OUTPUT_PATH}/i18n_atof)
-add_test(url        ${EXECUTABLE_OUTPUT_PATH}/url)
-add_test(utf8       ${EXECUTABLE_OUTPUT_PATH}/utf8)
-add_test(dictionary ${EXECUTABLE_OUTPUT_PATH}/dictionary)
+add_executable(test_i18n_atof  test/i18n_atof.c)
+add_executable(test_url        test/url.c)
+add_executable(test_utf8       test/utf8.c)
+add_executable(test_dictionary test/dictionary.c)
+
+target_link_libraries(test_i18n_atof  libvlc)
+target_link_libraries(test_url        libvlc)
+target_link_libraries(test_utf8       libvlc)
+target_link_libraries(test_dictionary libvlc)
+
+add_test(test_i18n_atof  ${CMAKE_CURRENT_BINARY_DIR}/test_i18n_atof)
+add_test(test_url        ${CMAKE_CURRENT_BINARY_DIR}/test_url)
+add_test(test_utf8       ${CMAKE_CURRENT_BINARY_DIR}/test_utf8)
+add_test(test_dictionary ${CMAKE_CURRENT_BINARY_DIR}/test_dictionary)