Improve header files handling in CMake.

This commit is contained in:
Ghislain MARY 2015-10-23 10:47:48 +02:00
parent cb330ae420
commit 141098e434
3 changed files with 4 additions and 5 deletions

View file

@ -51,7 +51,6 @@ set(LINPHONE_HEADER_FILES
)
set(LINPHONE_SOURCE_FILES
${LINPHONE_HEADER_FILES}
account_creator.c
address.c
authentication.c
@ -162,10 +161,10 @@ if(INTL_FOUND)
endif()
if(ENABLE_STATIC)
add_library(linphone STATIC ${LINPHONE_SOURCE_FILES})
add_library(linphone STATIC ${LINPHONE_HEADER_FILES} ${LINPHONE_SOURCE_FILES})
target_link_libraries(linphone ${LIBS})
else()
add_library(linphone SHARED ${LINPHONE_SOURCE_FILES})
add_library(linphone SHARED ${LINPHONE_HEADER_FILES} ${LINPHONE_SOURCE_FILES})
set_target_properties(linphone PROPERTIES VERSION ${LINPHONE_SO_VERSION} LINKER_LANGUAGE CXX)
target_link_libraries(linphone ${LIBS})
if(MSVC)

@ -1 +1 @@
Subproject commit 03869fcbacdf65c08e7b034188054d69bfc5648f
Subproject commit d6c107053b8dc55c754e2f01155d447adad60151

2
oRTP

@ -1 +1 @@
Subproject commit 133ed70f7b45bf972ab5be9593f68b7c15a3a3b2
Subproject commit 9a1e61aba3aad49fdc047aa21956ee07037f96b0