bake gitdescription and uuid into OSRM library to avoid failure points of linking them directly
This commit is contained in:
		
							parent
							
								
									238dd07cf6
								
							
						
					
					
						commit
						bb244646df
					
				@ -48,7 +48,7 @@ file(GLOB HttpGlob Server/Http/*.cpp)
 | 
			
		||||
file(GLOB LibOSRMGlob Library/*.cpp)
 | 
			
		||||
 | 
			
		||||
set(OSRMSources ${LibOSRMGlob} ${DescriptorGlob} ${DatastructureGlob} ${CoordinateGlob} ${AlgorithmGlob} ${HttpGlob})
 | 
			
		||||
add_library( OSRM SHARED ${OSRMSources} )
 | 
			
		||||
add_library( OSRM SHARED ${OSRMSources} Util/GitDescription.cpp Util/UUID.cpp )
 | 
			
		||||
add_library( UUID STATIC Util/UUID.cpp )
 | 
			
		||||
add_library( GITDESCRIPTION STATIC Util/GitDescription.cpp )
 | 
			
		||||
add_dependencies( UUID UUIDConfigure )
 | 
			
		||||
@ -109,12 +109,7 @@ if(NOT Boost_FOUND)
 | 
			
		||||
endif(NOT Boost_FOUND)
 | 
			
		||||
include_directories(${Boost_INCLUDE_DIRS})
 | 
			
		||||
 | 
			
		||||
if(APPLE)
 | 
			
		||||
	target_link_libraries( OSRM ${Boost_LIBRARIES} UUID )
 | 
			
		||||
else()
 | 
			
		||||
	target_link_libraries( OSRM ${Boost_LIBRARIES} )
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
target_link_libraries( OSRM ${Boost_LIBRARIES} )
 | 
			
		||||
target_link_libraries( osrm-extract ${CoordinateGlob} ${Boost_LIBRARIES} UUID GITDESCRIPTION )
 | 
			
		||||
target_link_libraries( osrm-prepare ${CoordinateGlob} ${Boost_LIBRARIES} UUID GITDESCRIPTION )
 | 
			
		||||
target_link_libraries( osrm-routed ${Boost_LIBRARIES} OSRM UUID GITDESCRIPTION )
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user