fly/flightgear
1
0
Fork 0
Code Activity

Fix Windows dependencies

Browse source 
SimgGear always needs "winmm" on Windows (due to timeGetTime in sgtimestamp.cxx)
This commit is contained in:
ThorstenB 2012-02-25 01:05:39 +01:00
parent da73dd97d3
commit ecb2e77e5b
2 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeModules/FindSimGear.cmake
View file

@ -193,7 +193,8 @@ else(SIMGEAR_SHARED)
set(SIMGEAR_CORE_LIBRARY_DEPENDENCIES set(SIMGEAR_CORE_LIBRARY_DEPENDENCIES
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${ZLIB_LIBRARY} ${ZLIB_LIBRARY}
${LIBSVN_LIBRARIES}) ${LIBSVN_LIBRARIES}
${WINMM_LIBRARY})
set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES
${ALUT_LIBRARY} ${ALUT_LIBRARY}

43
utils/GPSsmooth/CMakeLists.txt
View file

@ -1,38 +1,35 @@
add_executable(GPSsmooth gps.cxx gps.hxx gps_main.cxx) add_executable(GPSsmooth
add_executable(MIDGsmooth MIDG-II.cxx MIDG-II.hxx MIDG_main.cxx) gps.cxx gps.hxx
add_executable(UGsmooth gps_main.cxx
)
add_executable(MIDGsmooth
MIDG-II.cxx MIDG-II.hxx
MIDG_main.cxx
)
add_executable(UGsmooth
UGear.cxx UGear.hxx UGear.cxx UGear.hxx
UGear_command.cxx UGear_command.hxx UGear_command.cxx UGear_command.hxx
UGear_telnet.cxx UGear_telnet.hxx
UGear_main.cxx UGear_main.cxx
UGear_telnet.cxx )
UGear_telnet.hxx)
target_link_libraries(GPSsmooth target_link_libraries(GPSsmooth
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${PLIB_SG_LIBRARY} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
${PLIB_UL_LIBRARY}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
${ZLIB_LIBRARY}
${WINMM_LIBRARY}
) )
target_link_libraries(MIDGsmooth target_link_libraries(MIDGsmooth
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${PLIB_SG_LIBRARY} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
${PLIB_UL_LIBRARY}
${WINMM_LIBRARY}
${ZLIB_LIBRARY}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
) )
target_link_libraries(UGsmooth target_link_libraries(UGsmooth
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${PLIB_SG_LIBRARY} ${ZLIB_LIBRARY}
${PLIB_UL_LIBRARY} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
${WINMM_LIBRARY}
${ZLIB_LIBRARY}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
) )
install(TARGETS GPSsmooth MIDGsmooth UGsmooth RUNTIME DESTINATION bin) install(TARGETS GPSsmooth MIDGsmooth UGsmooth RUNTIME DESTINATION bin)