Commit 207d60d2 authored by Ghislain MARY's avatar Ghislain MARY

Handle c++11 features correctly with CMake.

parent ffd3eb51
......@@ -65,9 +65,7 @@ function(FIND_PROGRAM_REQUIRED varname progname)
endif()
endfunction()
# Configure CMAKE
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
add_definitions("-DHAVE_CONFIG_H")
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
# Required packages
......@@ -236,6 +234,7 @@ include_directories(
configure_file(${PROJECT_SOURCE_DIR}/cmake/flexisip-config.h.in ${PROJECT_BINARY_DIR}/flexisip-config.h)
set_source_files_properties(${PROJECT_BINARY_DIR}/flexisip-config.h PROPERTIES GENERATED ON)
add_definitions("-DHAVE_CONFIG_H")
add_subdirectory(src)
......
......@@ -214,6 +214,7 @@ if(FLEXISIP_DEPENDENCIES)
add_dependencies(flexisip ${FLEXISIP_DEPENDENCIES})
endif()
add_dependencies(flexisip flexisip-git-version)
target_compile_features(flexisip PRIVATE cxx_auto_type cxx_variadic_macros)
target_link_libraries(flexisip ${FLEXISIP_LIBS})
target_include_directories(flexisip PUBLIC ${FLEXISIP_INCLUDES})
......
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