mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-31 07:13:03 +00:00 
			
		
		
		
	Fix CXX and C standard reporting in CMake < 3.1
This commit is contained in:
		| @@ -407,25 +407,32 @@ if(NOT (CMAKE_VERSION VERSION_LESS "3.1")) | |||||||
|     set(CMAKE_CXX_EXTENSIONS OFF) |     set(CMAKE_CXX_EXTENSIONS OFF) | ||||||
| else() | else() | ||||||
|     add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,C>:-std=gnu11>") |     add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,C>:-std=gnu11>") | ||||||
|  |     set(CMAKE_C_STANDARD 11)   # set variable just for reporting | ||||||
|     if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32) |     if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32) | ||||||
|         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.1.1") |         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.1.1") | ||||||
|             add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++11>") |             add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++11>") | ||||||
|  |             set(CMAKE_CXX_STANDARD 11)   # set variable just for reporting | ||||||
|         else() |         else() | ||||||
|             add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++14>") |             add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++14>") | ||||||
|  |             set(CMAKE_CXX_STANDARD 14)   # set variable just for reporting | ||||||
|         endif() |         endif() | ||||||
|     endif() |     endif() | ||||||
|     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") |     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") | ||||||
|         if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") |         if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") | ||||||
|             if(CLANG_VERSION VERSION_LESS "600") |             if(CLANG_VERSION VERSION_LESS "600") | ||||||
|                 add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++11>") |                 add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++11>") | ||||||
|  |                 set(CMAKE_CXX_STANDARD 11) | ||||||
|             else() |             else() | ||||||
|                 add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++14>") |                 add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++14>") | ||||||
|  |                 set(CMAKE_CXX_STANDARD 14) | ||||||
|             endif() |             endif() | ||||||
|         else() |         else() | ||||||
|             if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0") |             if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0") | ||||||
|                 add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++11>") |                 add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++11>") | ||||||
|  |                 set(CMAKE_CXX_STANDARD 11) | ||||||
|             else() |             else() | ||||||
|                 add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++14>") |                 add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++14>") | ||||||
|  |                 set(CMAKE_CXX_STANDARD 14) | ||||||
|             endif() |             endif() | ||||||
|         endif() |         endif() | ||||||
|     endif() |     endif() | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Carles Fernandez
					Carles Fernandez