Commit f12eea15 authored by Benjamin REIS's avatar Benjamin REIS

fix preparation step on iOS with XCode 9

parent 5bcddfbf
......@@ -21,4 +21,7 @@
############################################################################
cmake_minimum_required(VERSION 2.8)
project(autotools LANGUAGES NONE)
configure_file(${CMAKE_SOURCE_DIR}/Autotools.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Autotools.cmake @ONLY)
\ No newline at end of file
......@@ -365,7 +365,7 @@ macro(linphone_builder_apply_flags)
endif()
if(LINPHONE_BUILDER_CXXFLAGS)
set(CMAKE_CXX_FLAGS_${BUILD_TYPE} "${CMAKE_CXX_FLAGS_${BUILD_TYPE}} ${LINPHONE_BUILDER_CXXFLAGS}")
set(AUTOTOOLS_CXX_FLAGS "{AUTOTOOLS_CXX_FLAGS} ${LINPHONE_BUILDER_CXX_FLAGS}")
set(AUTOTOOLS_CXX_FLAGS "${AUTOTOOLS_CXX_FLAGS} ${LINPHONE_BUILDER_CXX_FLAGS}")
endif()
if(LINPHONE_BUILDER_OBJCFLAGS)
set(CMAKE_C_FLAGS_${BUILD_TYPE} "${CMAKE_C_FLAGS_${BUILD_TYPE}} ${LINPHONE_BUILDER_OBJCFLAGS}")
......
......@@ -62,7 +62,7 @@ set(LINPHONE_BUILDER_LDFLAGS "${COMMON_FLAGS}")
set(LINPHONE_BUILDER_PKG_CONFIG_LIBDIR ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) # Restrict pkg-config to search in the install directory
unset(COMMON_FLAGS)
message ("-- Xcode version ${XCODE_VERSION}")
message(STATUS "Xcode version: ${XCODE_VERSION}")
#XCode7 requires Cmake 3.3.20150815 at least
if(NOT ${XCODE_VERSION} VERSION_LESS 7)
......
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