diff --git a/CMakeModules/FindSimGear.cmake b/CMakeModules/FindSimGear.cmake index 901b63c68..a1602790c 100644 --- a/CMakeModules/FindSimGear.cmake +++ b/CMakeModules/FindSimGear.cmake @@ -193,7 +193,8 @@ else(SIMGEAR_SHARED) set(SIMGEAR_CORE_LIBRARY_DEPENDENCIES ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARY} - ${LIBSVN_LIBRARIES}) + ${LIBSVN_LIBRARIES} + ${WINMM_LIBRARY}) set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES ${ALUT_LIBRARY} diff --git a/utils/GPSsmooth/CMakeLists.txt b/utils/GPSsmooth/CMakeLists.txt index 47bc1d54f..7992ef05d 100644 --- a/utils/GPSsmooth/CMakeLists.txt +++ b/utils/GPSsmooth/CMakeLists.txt @@ -1,38 +1,35 @@ -add_executable(GPSsmooth gps.cxx gps.hxx gps_main.cxx) -add_executable(MIDGsmooth MIDG-II.cxx MIDG-II.hxx MIDG_main.cxx) -add_executable(UGsmooth +add_executable(GPSsmooth + gps.cxx gps.hxx + gps_main.cxx +) + +add_executable(MIDGsmooth + MIDG-II.cxx MIDG-II.hxx + MIDG_main.cxx +) + +add_executable(UGsmooth UGear.cxx UGear.hxx UGear_command.cxx UGear_command.hxx + UGear_telnet.cxx UGear_telnet.hxx UGear_main.cxx - UGear_telnet.cxx - UGear_telnet.hxx) +) target_link_libraries(GPSsmooth - ${SIMGEAR_CORE_LIBRARIES} - ${PLIB_SG_LIBRARY} - ${PLIB_UL_LIBRARY} - ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} - ${ZLIB_LIBRARY} - ${WINMM_LIBRARY} + ${SIMGEAR_CORE_LIBRARIES} + ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ) target_link_libraries(MIDGsmooth - ${SIMGEAR_CORE_LIBRARIES} - ${PLIB_SG_LIBRARY} - ${PLIB_UL_LIBRARY} - ${WINMM_LIBRARY} - ${ZLIB_LIBRARY} - ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} + ${SIMGEAR_CORE_LIBRARIES} + ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ) target_link_libraries(UGsmooth - ${SIMGEAR_CORE_LIBRARIES} - ${PLIB_SG_LIBRARY} - ${PLIB_UL_LIBRARY} - ${WINMM_LIBRARY} - ${ZLIB_LIBRARY} - ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} + ${SIMGEAR_CORE_LIBRARIES} + ${ZLIB_LIBRARY} + ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ) install(TARGETS GPSsmooth MIDGsmooth UGsmooth RUNTIME DESTINATION bin)