Commit a0aae6c8 authored by jehan's avatar jehan

fix group mode for cxx wrapper

parent 5b861f2b
......@@ -32,6 +32,13 @@
if(NOT LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
include("${CMAKE_CURRENT_LIST_DIR}/LinphoneTargets.cmake")
endif()
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
include("${EP_ms2_CONFIG_DIR}/Mediastreamer2Config.cmake")
include("${EP_bellesip_CONFIG_DIR}/BelleSIPConfig.cmake")
else()
find_package(Mediastreamer2 REQUIRED)
find_package(BelleSIP REQUIRED)
endif()
if(@ENABLE_SHARED@)
set(LINPHONE_TARGETNAME linphone)
......
......@@ -20,7 +20,7 @@
#
############################################################################
if (ENABLE_DOC)
if (ENABLE_DOC OR CXX_WRAPPER)
find_package(Doxygen)
if(DOXYGEN_FOUND)
if(DOXYGEN_DOT_FOUND)
......@@ -39,7 +39,11 @@ if (ENABLE_DOC)
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doc/html" "${CMAKE_CURRENT_BINARY_DIR}/doc/xml"
DESTINATION "${CMAKE_INSTALL_DATADIR}/doc/linphone-${LINPHONE_VERSION}")
else()
message(WARNING "The dot program is needed to generate the linphone documentation. You can get it from http://www.graphviz.org/.")
if (CXX_WRAPPER)
message(FATAL_ERROR "The dot program is needed to generate the linphone documentation. You can get it from http://www.graphviz.org/.")
else()
message(WARNING "The dot program is needed to generate the linphone documentation. You can get it from http://www.graphviz.org/.")
endif()
endif()
endif()
endif()
......
......@@ -29,6 +29,13 @@
# LINPHONECXX_INCLUDE_DIRS - the linphone++ include directory
# LINPHONECXX_LIBRARIES - The libraries needed to use linphone++
# LINPHONECXX_LDFLAGS - The linking flags needed to use linphone++
if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
include("${EP_ms2_CONFIG_DIR}/Mediastreamer2Config.cmake")
include("${EP_bellesip_CONFIG_DIR}/BelleSIPConfig.cmake")
else()
find_package(BelleSIP)
find_package(Linphone)
endif()
include("${CMAKE_CURRENT_LIST_DIR}/LinphoneCxxTargets.cmake")
set(LINPHONECXX_LDFLAGS "")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment