Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
belr
Commits
3b8d4fa1
Commit
3b8d4fa1
authored
Nov 05, 2018
by
Ghislain MARY
Browse files
No longer put the "-stdlib=libc++" build option since we now target Mac OS X 10.9.
parent
b9f1b75a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
11 deletions
+1
-11
CMakeLists.txt
CMakeLists.txt
+0
-1
src/CMakeLists.txt
src/CMakeLists.txt
+0
-3
tester/CMakeLists.txt
tester/CMakeLists.txt
+0
-3
tools/CMakeLists.txt
tools/CMakeLists.txt
+1
-4
No files found.
CMakeLists.txt
View file @
3b8d4fa1
...
...
@@ -86,7 +86,6 @@ else()
endif
()
if
(
APPLE
)
list
(
APPEND STRICT_OPTIONS_CPP
"-Wno-error=unknown-warning-option"
"-Qunused-arguments"
"-Wno-tautological-compare"
"-Wno-unused-function"
"-Wno-array-bounds"
)
list
(
APPEND STRICT_OPTIONS_CXX
"-stdlib=libc++"
)
endif
()
if
(
ENABLE_STRICT
)
list
(
APPEND STRICT_OPTIONS_CPP
"-Werror"
"-Wextra"
"-Wno-unused-parameter"
"-fno-strict-aliasing"
)
...
...
src/CMakeLists.txt
View file @
3b8d4fa1
...
...
@@ -51,9 +51,6 @@ if(ENABLE_STATIC)
endif
()
if
(
ENABLE_SHARED
)
add_library
(
belr SHARED
${
BELR_HEADER_FILES
}
${
BELR_SOURCE_FILES_C
}
${
BELR_SOURCE_FILES_CXX
}
)
if
(
APPLE
)
set_target_properties
(
belr PROPERTIES LINK_FLAGS
"-stdlib=libc++"
)
endif
()
#TODO: replace by if(APPLE) when we want to make apple framework on linphone-desktop too
if
(
IOS
)
if
(
IOS
)
...
...
tester/CMakeLists.txt
View file @
3b8d4fa1
...
...
@@ -56,9 +56,6 @@ if(NOT "${LINK_FLAGS_STR}" STREQUAL "")
set_target_properties
(
belle_sip_tester PROPERTIES LINK_FLAGS
"
${
LINK_FLAGS_STR
}
"
)
endif
()
if
(
APPLE
)
set_target_properties
(
belr_tester PROPERTIES LINK_FLAGS
"-stdlib=libc++"
)
endif
()
if
(
NOT IOS
)
install
(
TARGETS belr_tester
RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
...
...
tools/CMakeLists.txt
View file @
3b8d4fa1
...
...
@@ -32,11 +32,8 @@ foreach(EXECUTABLE belr-parse belr-demo belr-compiler)
add_executable
(
${
EXECUTABLE
}
${
SOURCE_FILES_CXX
}
)
set_target_properties
(
${
EXECUTABLE
}
PROPERTIES LINKER_LANGUAGE CXX
)
target_link_libraries
(
${
EXECUTABLE
}
${
BELR_LIBRARIES_FOR_TOOLS
}
${
BCTOOLBOX_CORE_LIBRARIES
}
)
if
(
APPLE
)
set_target_properties
(
${
EXECUTABLE
}
PROPERTIES LINK_FLAGS
"-stdlib=libc++"
)
endif
()
endforeach
()
if
(
NOT IOS
)
install
(
TARGETS belr-parse belr-compiler
RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
...
...
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