cmake: Correctly set te build target for the modules and for vlc.

diff --git a/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt b/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
index dd11402c9ec50098f4f8c3117ab065cd1171c15d..3c98a2ced39eda56e1fff27c9e30a70cc4d63c30 100644 (file)
--- a/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
+++ b/extras/buildsystem/cmake/CMakeLists/src_CMakeLists.txt
@@ -9,7 +9,7 @@ add_definitions(-DPLUGIN_PATH=\\"${CMAKE_INSTALL_PREFIX}/lib/vlc\\")
 add_executable(vlc vlc.c)
 target_link_libraries(vlc libvlc)
 
 add_executable(vlc vlc.c)
 target_link_libraries(vlc libvlc)
 

-install_programs(/bin FILES vlc)
+install_targets(/bin vlc)

 
 # libvlc
 
 
 # libvlc
 

diff --git a/extras/buildsystem/cmake/include/vlc_module_funcs.cmake b/extras/buildsystem/cmake/include/vlc_module_funcs.cmake
index cb233a012fbb23cb7f19594861096c05245347d6..01452bc6875cbc858ff9c2743c9ae156b27b28ce 100644 (file)
--- a/extras/buildsystem/cmake/include/vlc_module_funcs.cmake
+++ b/extras/buildsystem/cmake/include/vlc_module_funcs.cmake
@@ -12,6 +12,7 @@ MACRO(vlc_add_module module_name)
         if (VLC_${module_name}_LINK_LIBRARIES)
             target_link_libraries( vlc_${module_name} ${VLC_${module_name}_LINK_LIBRARIES})
         endif (VLC_${module_name}_LINK_LIBRARIES)
         if (VLC_${module_name}_LINK_LIBRARIES)
             target_link_libraries( vlc_${module_name} ${VLC_${module_name}_LINK_LIBRARIES})
         endif (VLC_${module_name}_LINK_LIBRARIES)

+        install_targets(/modules vlc_${module_name})

     endif(ENABLE_VLC_MODULE_${module_name})
 ENDMACRO(vlc_add_module)
 
     endif(ENABLE_VLC_MODULE_${module_name})
 ENDMACRO(vlc_add_module)