Merge "Replace LIBRARIES by LDFLAGS for pkgconfig dep"
authorRomain Forlot <romain.forlot@iot.bzh>
Tue, 13 Jun 2017 08:51:45 +0000 (08:51 +0000)
committerGerrit Code Review <gerrit@automotivelinux.org>
Tue, 13 Jun 2017 08:51:45 +0000 (08:51 +0000)
1  2 
cmake/common.cmake

diff --combined cmake/common.cmake
@@@ -113,7 -113,7 +113,7 @@@ macro(project_targets_populate
                                        COMMAND cp ${BD}/${P}${OUT}.so ${PACKAGE_LIBDIR}
                                )
                                add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_LIBDIR}/${P}${TARGET}.so)
 -                              add_dependencies(populate ${POPULE_PACKAGE_TARGET}) 
 +                              add_dependencies(populate ${POPULE_PACKAGE_TARGET})
                        elseif(${T} STREQUAL "EXECUTABLE")
                                add_custom_command(OUTPUT ${PACKAGE_BINDIR}/${P}${TARGET}
                                        DEPENDS ${TARGET}
                                        COMMAND cp ${BD}/${P}${OUT} ${PACKAGE_BINDIR}
                                )
                                add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_BINDIR}/${P}${TARGET})
 -                              add_dependencies(populate ${POPULE_PACKAGE_TARGET}) 
 +                              add_dependencies(populate ${POPULE_PACKAGE_TARGET})
                        elseif(${T} STREQUAL "HTDOCS")
                                add_custom_command(OUTPUT ${PACKAGE_HTTPDIR}-xx
                                        DEPENDS ${TARGET}
                                        COMMAND cp -r ${BD}/${P}${OUT}/* ${PACKAGE_HTTPDIR}
                                )
                                        add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_HTTPDIR}-xx)
 -                                      add_dependencies(populate ${POPULE_PACKAGE_TARGET}) 
 +                                      add_dependencies(populate ${POPULE_PACKAGE_TARGET})
                        elseif(${T} STREQUAL "DATA")
                                add_custom_command(OUTPUT ${PACKAGE_DATADIR}-xx
                                        DEPENDS ${TARGET}
                                        COMMAND cp -r ${BD}/${P}${OUT} ${PACKAGE_DATADIR}
                                )
                                        add_custom_target(${POPULE_PACKAGE_TARGET} DEPENDS ${PACKAGE_DATADIR}-xx)
 -                                      add_dependencies(populate ${POPULE_PACKAGE_TARGET}) 
 +                                      add_dependencies(populate ${POPULE_PACKAGE_TARGET})
                        endif(${T} STREQUAL "BINDING")
                elseif(${CMAKE_BUILD_TYPE} MATCHES "[Dd][Ee][Bb][Uu][Gg]")
                        MESSAGE(".. Warning: ${TARGET} ignored when packaging.")
@@@ -156,7 -156,7 +156,7 @@@ macro(remote_targets_populate
        endif()
  
        set(
 -              REMOTE_LAUNCH "Test on target with: ${CMAKE_CURRENT_BINARY_DIR}/target/start-on-${RSYNC_TARGET}.sh" 
 +              REMOTE_LAUNCH "Test on target with: ${CMAKE_CURRENT_BINARY_DIR}/target/start-on-${RSYNC_TARGET}.sh"
                CACHE STRING "Command to start ${PROJECT_NAME} on remote target ${RSYNC_TARGET}"
        )
  
@@@ -187,13 -187,6 +187,13 @@@ macro(wgt_package_build
        if(NOT EXISTS ${WGT_TEMPLATE_DIR}/icon-default.png)
                MESSAGE(FATAL_ERROR "${Red}WARNING ! Missing mandatory files to build widget file.\nYou need ${PROJECT_ICON} file in ${WGT_TEMPLATE_DIR} folder.${ColourReset}")
        endif()
 +      if(NOT WIDGET_TYPE)
 +              MESSAGE(FATAL_ERROR "WIDGET_TYPE must be set in your config.cmake.\neg.: set(WIDGET_TYPE application/vnd.agl.service)")
 +      endif()
 +
 +      if(NOT WIDGET_ENTRY_POINT)
 +              set(WIDGET_ENTRY_POINT lib)
 +      endif()
  
        configure_file(${WIDGET_CONFIG_TEMPLATE} ${PROJECT_PKG_BUILD_DIR}/config.xml)
        file(COPY ${WGT_TEMPLATE_DIR}/icon-default.png DESTINATION ${PROJECT_PKG_BUILD_DIR})
@@@ -340,7 -333,7 +340,7 @@@ foreach (PKG_CONFIG ${PKG_REQUIRED_LIST
        PKG_CHECK_MODULES(${XPREFIX} REQUIRED ${PKG_CONFIG})
  
        INCLUDE_DIRECTORIES(${${XPREFIX}_INCLUDE_DIRS})
-       list (APPEND link_libraries ${${XPREFIX}_LIBRARIES})
+       list (APPEND link_libraries ${${XPREFIX}_LDFLAGS})
        add_compile_options (${${XPREFIX}_CFLAGS})
  endforeach(PKG_CONFIG)