mirror of
				https://github.com/gnss-sdr/gnss-sdr
				synced 2025-10-31 15:23:04 +00:00 
			
		
		
		
	Fix for old CMake versions
This commit is contained in:
		| @@ -1335,6 +1335,10 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c | |||||||
|             set(GLOG_LIBRARIES |             set(GLOG_LIBRARIES | ||||||
|                 ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/.libs/${CMAKE_FIND_LIBRARY_PREFIXES}glog${CMAKE_STATIC_LIBRARY_SUFFIX} |                 ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/.libs/${CMAKE_FIND_LIBRARY_PREFIXES}glog${CMAKE_STATIC_LIBRARY_SUFFIX} | ||||||
|             ) |             ) | ||||||
|  |             set(GLOG_INCLUDE_DIRS | ||||||
|  |                 ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/src | ||||||
|  |                 ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/src | ||||||
|  |             ) | ||||||
|         else()  # CMake > 3.0 but < 3.2 |         else()  # CMake > 3.0 but < 3.2 | ||||||
|             ExternalProject_Add(glog-${GNSSSDR_GLOG_LOCAL_VERSION} |             ExternalProject_Add(glog-${GNSSSDR_GLOG_LOCAL_VERSION} | ||||||
|                 DEPENDS ${TARGET_GFLAGS} |                 DEPENDS ${TARGET_GFLAGS} | ||||||
| @@ -1349,6 +1353,11 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c | |||||||
|                 PATCH_COMMAND "" |                 PATCH_COMMAND "" | ||||||
|                 INSTALL_COMMAND "" |                 INSTALL_COMMAND "" | ||||||
|             ) |             ) | ||||||
|  |             set(GLOG_INCLUDE_DIRS | ||||||
|  |                 ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/src | ||||||
|  |                 ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION} | ||||||
|  |                 ${GFlags_INCLUDE_DIRS} | ||||||
|  |             ) | ||||||
|         endif() |         endif() | ||||||
|     else()  # CMake > 3.2 |     else()  # CMake > 3.2 | ||||||
|         set(GLOG_BUILD_BYPRODUCTS |         set(GLOG_BUILD_BYPRODUCTS | ||||||
| @@ -1376,6 +1385,11 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c | |||||||
|             PATCH_COMMAND "" |             PATCH_COMMAND "" | ||||||
|             INSTALL_COMMAND "" |             INSTALL_COMMAND "" | ||||||
|         ) |         ) | ||||||
|  |         set(GLOG_INCLUDE_DIRS | ||||||
|  |             ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/src | ||||||
|  |             ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION} | ||||||
|  |             ${GFlags_INCLUDE_DIRS} | ||||||
|  |         ) | ||||||
|     endif() |     endif() | ||||||
|  |  | ||||||
|     add_dependencies(glog-${GNSSSDR_GLOG_LOCAL_VERSION} Gflags::gflags) |     add_dependencies(glog-${GNSSSDR_GLOG_LOCAL_VERSION} Gflags::gflags) | ||||||
| @@ -1384,11 +1398,6 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/c | |||||||
|     if(NOT TARGET Glog::glog) |     if(NOT TARGET Glog::glog) | ||||||
|         file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/src) |         file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/src) | ||||||
|         file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}) |         file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION}) | ||||||
|         set(GLOG_INCLUDE_DIRS |  | ||||||
|             ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${GNSSSDR_GLOG_LOCAL_VERSION}/src |  | ||||||
|             ${CMAKE_CURRENT_BINARY_DIR}/glog-${GNSSSDR_GLOG_LOCAL_VERSION} |  | ||||||
|             ${GFlags_INCLUDE_DIRS} |  | ||||||
|         ) |  | ||||||
|         add_library(Glog::glog STATIC IMPORTED) |         add_library(Glog::glog STATIC IMPORTED) | ||||||
|         add_dependencies(Glog::glog glog-${GNSSSDR_GLOG_LOCAL_VERSION}) |         add_dependencies(Glog::glog glog-${GNSSSDR_GLOG_LOCAL_VERSION}) | ||||||
|         if(CMAKE_VERSION VERSION_LESS 3.0) |         if(CMAKE_VERSION VERSION_LESS 3.0) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Carles Fernandez
					Carles Fernandez