Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
liblinphone
Commits
f78125e5
Commit
f78125e5
authored
Jul 05, 2018
by
François Grisez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix build while -DENABLE_SHARED=NO
parent
8ab1cde0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
src/CMakeLists.txt
src/CMakeLists.txt
+2
-3
No files found.
src/CMakeLists.txt
View file @
f78125e5
...
...
@@ -372,7 +372,6 @@ set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS
${
SOCI_INCLUDE_DIRS
}
${
SOCI_MYSQL_INCLUDES
}
)
set
(
LINPHONE_CXX_OBJECTS_DEFINITIONS
"-DLINPHONE_EXPORTS"
)
set
(
LINPHONE_CXX_OBJECTS_INCLUDE_DIRS
${
BELR_INCLUDE_DIRS
}
)
set
(
LINPHONE_PRIVATE_HEADER_FILES
)
...
...
@@ -410,6 +409,7 @@ if(ENABLE_SHARED)
${
LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
}
${
LINPHONE_CXX_OBJECTS_SOURCE_FILES
}
${
LINPHONE_OBJC_SOURCE_FILES
}
$<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
if
(
IOS
)
if
(
IOS
)
...
...
@@ -443,7 +443,7 @@ if(ENABLE_SHARED)
endif
()
if
(
WIN32
)
# 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"
)
set_target_properties
(
linphone PROPERTIES PREFIX
"lib"
)
endif
()
...
...
@@ -466,7 +466,6 @@ if(ENABLE_SHARED)
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
)
endif
()
target_compile_definitions
(
linphone PRIVATE
${
LINPHONE_CXX_OBJECTS_DEFINITIONS
}
)
if
(
ICONV_FOUND
)
if
(
APPLE
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment