set project and fingerprint target language to CXX explicitly, fixes AppVeyor build. Potentially Travis, too.
This commit is contained in:
		
							parent
							
								
									3e49bf4f42
								
							
						
					
					
						commit
						0640ce9632
					
				| @ -6,7 +6,7 @@ Please create a directory and run cmake from there, passing the path to this sou | |||||||
| This process created the file `CMakeCache.txt' and the directory `CMakeFiles'. Please delete them.") | This process created the file `CMakeCache.txt' and the directory `CMakeFiles'. Please delete them.") | ||||||
| endif() | endif() | ||||||
| 
 | 
 | ||||||
| project(OSRM) | project(OSRM CXX) | ||||||
| set(CMAKE_EXPORT_COMPILE_COMMANDS ON) | set(CMAKE_EXPORT_COMPILE_COMMANDS ON) | ||||||
| include(CheckCXXCompilerFlag) | include(CheckCXXCompilerFlag) | ||||||
| include(FindPackageHandleStandardArgs) | include(FindPackageHandleStandardArgs) | ||||||
| @ -93,6 +93,7 @@ add_library(FINGERPRINT OBJECT util/fingerprint.cpp) | |||||||
| add_library(GITDESCRIPTION OBJECT util/git_sha.cpp) | add_library(GITDESCRIPTION OBJECT util/git_sha.cpp) | ||||||
| add_library(OSRM ${OSRMSources} $<TARGET_OBJECTS:ANGLE> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE> $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:MERCATOR>) | add_library(OSRM ${OSRMSources} $<TARGET_OBJECTS:ANGLE> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE> $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:MERCATOR>) | ||||||
| add_dependencies(FINGERPRINT FingerPrintConfigure) | add_dependencies(FINGERPRINT FingerPrintConfigure) | ||||||
|  | set_target_properties(FINGERPRINT PROPERTIES LINKER_LANGUAGE CXX) | ||||||
| 
 | 
 | ||||||
| add_executable(osrm-routed routed.cpp ${ServerGlob} $<TARGET_OBJECTS:EXCEPTION>) | add_executable(osrm-routed routed.cpp ${ServerGlob} $<TARGET_OBJECTS:EXCEPTION>) | ||||||
| add_executable(osrm-datastore datastore.cpp $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:MERCATOR>) | add_executable(osrm-datastore datastore.cpp $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:MERCATOR>) | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user