Commit f78125e5 authored by François Grisez's avatar François Grisez
Browse files

Fix build while -DENABLE_SHARED=NO

parent 8ab1cde0
...@@ -372,7 +372,6 @@ set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ...@@ -372,7 +372,6 @@ set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS
${SOCI_INCLUDE_DIRS} ${SOCI_INCLUDE_DIRS}
${SOCI_MYSQL_INCLUDES} ${SOCI_MYSQL_INCLUDES}
) )
set(LINPHONE_CXX_OBJECTS_DEFINITIONS "-DLINPHONE_EXPORTS")
set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${BELR_INCLUDE_DIRS}) set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${BELR_INCLUDE_DIRS})
set(LINPHONE_PRIVATE_HEADER_FILES) set(LINPHONE_PRIVATE_HEADER_FILES)
...@@ -410,6 +409,7 @@ if(ENABLE_SHARED) ...@@ -410,6 +409,7 @@ if(ENABLE_SHARED)
${LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES} ${LINPHONE_CXX_OBJECTS_SOURCE_FILES} ${LINPHONE_OBJC_SOURCE_FILES} ${LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES} ${LINPHONE_CXX_OBJECTS_SOURCE_FILES} ${LINPHONE_OBJC_SOURCE_FILES}
$<TARGET_OBJECTS:linphone-coreapi> $<TARGET_OBJECTS:linphone-coreapi>
) )
target_compile_definition(linphone PRIVATE "-DLINPHONE_EXPORTS")
#TODO: replace by if(APPLE) when we want to make apple framework on linphone-desktop too #TODO: replace by if(APPLE) when we want to make apple framework on linphone-desktop too
if(IOS) if(IOS)
if(IOS) if(IOS)
...@@ -443,7 +443,7 @@ if(ENABLE_SHARED) ...@@ -443,7 +443,7 @@ if(ENABLE_SHARED)
endif() endif()
if(WIN32) if(WIN32)
# Export Xerces and Soci symbols. # Export Xerces and Soci symbols.
list(APPEND LINPHONE_CXX_OBJECTS_DEFINITIONS "-DDLL_EXPORT" "-DSOCI_DLL") target_compile_definitions(linphone PRIVATE "-DDLL_EXPORT" "-DSOCI_DLL")
if(CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") if(CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone" AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
set_target_properties(linphone PROPERTIES PREFIX "lib") set_target_properties(linphone PROPERTIES PREFIX "lib")
endif() endif()
...@@ -466,7 +466,6 @@ if(ENABLE_SHARED) ...@@ -466,7 +466,6 @@ if(ENABLE_SHARED)
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
) )
endif() endif()
target_compile_definitions(linphone PRIVATE ${LINPHONE_CXX_OBJECTS_DEFINITIONS})
if(ICONV_FOUND) if(ICONV_FOUND)
if(APPLE) if(APPLE)
......
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