mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-31 15:23:04 +00:00 
			
		
		
		
	Reordering ARM and SSE detection.
This commit is contained in:
		| @@ -27,8 +27,7 @@ cmake_minimum_required(VERSION 2.8) | |||||||
| project(gnss-sdr CXX C) | project(gnss-sdr CXX C) | ||||||
| list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules) | list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules) | ||||||
| file(RELATIVE_PATH RELATIVE_CMAKE_CALL ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) | file(RELATIVE_PATH RELATIVE_CMAKE_CALL ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) | ||||||
| include(TestForARM) |  | ||||||
| include(TestForSSE) |  | ||||||
|  |  | ||||||
|  |  | ||||||
| ######################################################################## | ######################################################################## | ||||||
| @@ -222,6 +221,22 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") | |||||||
| endif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") | endif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ################################################################################ | ||||||
|  | # Check if the compiler defines the architecture as ARM | ||||||
|  | ################################################################################ | ||||||
|  | if(NOT OS_IS_MACOSX) | ||||||
|  |      include(TestForARM) | ||||||
|  | endif(NOT OS_IS_MACOSX) | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ################################################################################ | ||||||
|  | # Check for availability of SSE | ||||||
|  | ################################################################################ | ||||||
|  | if(NOT ENABLE_GENERIC_ARCH) | ||||||
|  |      include(TestForSSE) | ||||||
|  | endif(NOT ENABLE_GENERIC_ARCH) | ||||||
|  |  | ||||||
|  |  | ||||||
| ################################################################################ | ################################################################################ | ||||||
| # Googletest - http://code.google.com/p/googletest/ | # Googletest - http://code.google.com/p/googletest/ | ||||||
| ################################################################################ | ################################################################################ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Carles Fernandez
					Carles Fernandez