Commit 96d5889a authored by Benjamin REIS's avatar Benjamin REIS

Do not disable tools when option set to on

parent 8bf24353
...@@ -89,7 +89,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES") ...@@ -89,7 +89,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES")
lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO") lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO")
lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO") lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO")
lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO") lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO")
lcb_builder_cmake_options(linphone "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO") lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO")
lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO") lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
lcb_builder_cmake_options(linphone "-DENABLE_MSG_STORAGE=YES") lcb_builder_cmake_options(linphone "-DENABLE_MSG_STORAGE=YES")
...@@ -110,7 +109,6 @@ lcb_builder_cmake_options(ms2 "-DENABLE_GLX=NO") ...@@ -110,7 +109,6 @@ lcb_builder_cmake_options(ms2 "-DENABLE_GLX=NO")
lcb_builder_cmake_options(ms2 "-DENABLE_V4L=NO") lcb_builder_cmake_options(ms2 "-DENABLE_V4L=NO")
lcb_builder_cmake_options(ms2 "-DENABLE_X11=NO") lcb_builder_cmake_options(ms2 "-DENABLE_X11=NO")
lcb_builder_cmake_options(ms2 "-DENABLE_XV=NO") lcb_builder_cmake_options(ms2 "-DENABLE_XV=NO")
lcb_builder_cmake_options(ms2 "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
lcb_builder_cmake_options(ms2 "-DENABLE_DOC=NO") lcb_builder_cmake_options(ms2 "-DENABLE_DOC=NO")
lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO") lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO")
lcb_builder_linking_type(ms2 "-DENABLE_STATIC=NO" "-DENABLE_SHARED=YES") lcb_builder_linking_type(ms2 "-DENABLE_STATIC=NO" "-DENABLE_SHARED=YES")
......
...@@ -61,7 +61,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES") ...@@ -61,7 +61,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES")
lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO") lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO")
lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO") lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO")
lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO") lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO")
lcb_builder_cmake_options(linphone "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO") lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO")
lcb_builder_cmake_options(linphone "-DENABLE_UNIT_TESTS=NO") lcb_builder_cmake_options(linphone "-DENABLE_UNIT_TESTS=NO")
lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO") lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
...@@ -84,7 +83,6 @@ lcb_builder_cmake_options(ms2 "-DENABLE_XV=NO") ...@@ -84,7 +83,6 @@ lcb_builder_cmake_options(ms2 "-DENABLE_XV=NO")
lcb_builder_cmake_options(ms2 "-DENABLE_MKV=YES") lcb_builder_cmake_options(ms2 "-DENABLE_MKV=YES")
lcb_builder_cmake_options(ms2 "-DENABLE_QNX=YES") lcb_builder_cmake_options(ms2 "-DENABLE_QNX=YES")
lcb_builder_cmake_options(ms2 "-DENABLE_V4L=NO") lcb_builder_cmake_options(ms2 "-DENABLE_V4L=NO")
lcb_builder_cmake_options(ms2 "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO") lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO")
# vpx # vpx
......
...@@ -63,8 +63,8 @@ if(NOT ${XCODE_VERSION} VERSION_LESS 7) ...@@ -63,8 +63,8 @@ if(NOT ${XCODE_VERSION} VERSION_LESS 7)
endif() endif()
endif() endif()
set(LINPHONE_BUILDER_CXXFLAGS "-stdlib=libc++") set(LINPHONE_BUILDER_CXXFLAGS "${LINPHONE_BUILDER_CXXFLAGS} -stdlib=libc++")
set(LINPHONE_BUILDER_LDFLAGS "-stdlib=libc++") set(LINPHONE_BUILDER_LDFLAGS "${LINPHONE_BUILDER_LDFLAGS} -stdlib=libc++")
# Include builders # Include builders
include(builders/CMakeLists.txt) include(builders/CMakeLists.txt)
...@@ -84,7 +84,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO") ...@@ -84,7 +84,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
lcb_builder_cmake_options(linphone "-DENABLE_MSG_STORAGE=YES") lcb_builder_cmake_options(linphone "-DENABLE_MSG_STORAGE=YES")
lcb_builder_cmake_options(linphone "-DENABLE_DOC=NO") lcb_builder_cmake_options(linphone "-DENABLE_DOC=NO")
lcb_builder_cmake_options(linphone "-DENABLE_NLS=NO") lcb_builder_cmake_options(linphone "-DENABLE_NLS=NO")
lcb_builder_cmake_options(linphone "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
# mbedtls # mbedtls
lcb_builder_linking_type(mbedtls "-DUSE_STATIC_MBEDTLS_LIBRARY=YES" "-DUSE_SHARED_MBEDTLS_LIBRARY=NO") lcb_builder_linking_type(mbedtls "-DUSE_STATIC_MBEDTLS_LIBRARY=YES" "-DUSE_SHARED_MBEDTLS_LIBRARY=NO")
...@@ -98,7 +97,6 @@ lcb_builder_cmake_options(ms2 "-DENABLE_GLX=NO") ...@@ -98,7 +97,6 @@ lcb_builder_cmake_options(ms2 "-DENABLE_GLX=NO")
lcb_builder_cmake_options(ms2 "-DENABLE_X11=NO") lcb_builder_cmake_options(ms2 "-DENABLE_X11=NO")
lcb_builder_cmake_options(ms2 "-DENABLE_XV=NO") lcb_builder_cmake_options(ms2 "-DENABLE_XV=NO")
lcb_builder_cmake_options(ms2 "-DENABLE_DOC=NO") lcb_builder_cmake_options(ms2 "-DENABLE_DOC=NO")
lcb_builder_cmake_options(ms2 "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
# opus # opus
lcb_builder_cmake_options(opus "-DENABLE_FIXED_POINT=YES") lcb_builder_cmake_options(opus "-DENABLE_FIXED_POINT=YES")
......
...@@ -89,7 +89,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES") ...@@ -89,7 +89,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES")
lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO") lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO")
lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO") lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO")
lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO") lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO")
lcb_builder_cmake_options(linphone "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO") lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO")
lcb_builder_cmake_options(linphone "-DENABLE_UNIT_TESTS=NO") lcb_builder_cmake_options(linphone "-DENABLE_UNIT_TESTS=NO")
lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO") lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
...@@ -100,7 +99,6 @@ lcb_builder_linking_type(mbedtls "-DUSE_STATIC_MBEDTLS_LIBRARY=YES" "-DUSE_SHARE ...@@ -100,7 +99,6 @@ lcb_builder_linking_type(mbedtls "-DUSE_STATIC_MBEDTLS_LIBRARY=YES" "-DUSE_SHARE
# ms2 # ms2
lcb_builder_cmake_options(ms2 "-DENABLE_RELATIVE_PREFIX=YES") lcb_builder_cmake_options(ms2 "-DENABLE_RELATIVE_PREFIX=YES")
lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO") lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO")
lcb_builder_cmake_options(ms2 "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
lcb_builder_cmake_options(ms2 "-DENABLE_PCAP=NO") lcb_builder_cmake_options(ms2 "-DENABLE_PCAP=NO")
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
lcb_builder_cmake_options(ms2 "-DENABLE_ALSA=YES") lcb_builder_cmake_options(ms2 "-DENABLE_ALSA=YES")
......
...@@ -74,7 +74,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES") ...@@ -74,7 +74,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES")
lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO") lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO")
lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO") lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO")
lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO") lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO")
lcb_builder_cmake_options(linphone "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO") lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO")
lcb_builder_cmake_options(linphone "-DENABLE_UNIT_TESTS=NO") lcb_builder_cmake_options(linphone "-DENABLE_UNIT_TESTS=NO")
lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO") lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
...@@ -88,7 +87,6 @@ endif() ...@@ -88,7 +87,6 @@ endif()
# mediastreamer2 # mediastreamer2
lcb_builder_cmake_options(ms2 "-DENABLE_RELATIVE_PREFIX=YES") lcb_builder_cmake_options(ms2 "-DENABLE_RELATIVE_PREFIX=YES")
lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO") lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO")
lcb_builder_cmake_options(ms2 "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
lcb_builder_cmake_options(ms2 "-DENABLE_ALSA=YES") lcb_builder_cmake_options(ms2 "-DENABLE_ALSA=YES")
lcb_builder_cmake_options(ms2 "-DENABLE_PULSEAUDIO=NO") lcb_builder_cmake_options(ms2 "-DENABLE_PULSEAUDIO=NO")
......
...@@ -59,13 +59,11 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES") ...@@ -59,13 +59,11 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES")
lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO") lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO")
lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO") lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO")
lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO") lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO")
lcb_builder_cmake_options(linphone "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO") lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO")
lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO") lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
# ms2 # ms2
lcb_builder_cmake_options(ms2 "-DENABLE_RELATIVE_PREFIX=YES") lcb_builder_cmake_options(ms2 "-DENABLE_RELATIVE_PREFIX=YES")
lcb_builder_cmake_options(ms2 "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
# opus # opus
lcb_builder_cmake_options(opus "-DENABLE_ASM=NO") lcb_builder_cmake_options(opus "-DENABLE_ASM=NO")
......
...@@ -45,7 +45,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES") ...@@ -45,7 +45,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_RELATIVE_PREFIX=YES")
lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO") lcb_builder_cmake_options(linphone "-DENABLE_CONSOLE_UI=NO")
lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO") lcb_builder_cmake_options(linphone "-DENABLE_DAEMON=NO")
lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO") lcb_builder_cmake_options(linphone "-DENABLE_NOTIFY=NO")
lcb_builder_cmake_options(linphone "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO") lcb_builder_cmake_options(linphone "-DENABLE_TUTORIALS=NO")
lcb_builder_cmake_options(linphone "-DENABLE_UNIT_TESTS=NO") lcb_builder_cmake_options(linphone "-DENABLE_UNIT_TESTS=NO")
lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO") lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
...@@ -53,7 +52,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO") ...@@ -53,7 +52,6 @@ lcb_builder_cmake_options(linphone "-DENABLE_UPNP=NO")
# ms2 # ms2
lcb_builder_cmake_options(ms2 "-DENABLE_RELATIVE_PREFIX=YES") lcb_builder_cmake_options(ms2 "-DENABLE_RELATIVE_PREFIX=YES")
lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO") lcb_builder_cmake_options(ms2 "-DENABLE_UNIT_TESTS=NO")
lcb_builder_cmake_options(ms2 "-DENABLE_TOOLS=DEFAULT_VALUE_ENABLE_TOOLS")
# vpx # vpx
set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared" "--enable-pic") set(EP_vpx_LINKING_TYPE "--enable-static" "--disable-shared" "--enable-pic")
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