Fix Windows-build linking issue and unify CMake files a bit
This commit is contained in:
parent
451e63f84e
commit
a83bf32c2c
3 changed files with 4 additions and 6 deletions
|
@ -36,6 +36,7 @@ if (MSVC)
|
|||
else (EXISTS ${TEST_3RDPARTY_DIR})
|
||||
set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted")
|
||||
endif (EXISTS ${TEST_3RDPARTY_DIR})
|
||||
set( RT_LIBRARY "winmm.lib" )
|
||||
else (MSVC)
|
||||
set(MSVC_3RDPARTY_ROOT NOT_FOUND CACHE PATH "Location where the third-party dependencies are extracted")
|
||||
endif (MSVC)
|
||||
|
|
|
@ -27,6 +27,7 @@ target_link_libraries(genapts850
|
|||
${SIMGEAR_CORE_LIBRARIES}
|
||||
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
|
||||
${GPC_LIBRARY}
|
||||
${NEWMAT_LIBRARY})
|
||||
${NEWMAT_LIBRARY}
|
||||
${RT_LIBRARY})
|
||||
|
||||
install(TARGETS genapts850 RUNTIME DESTINATION bin)
|
||||
|
|
|
@ -1,15 +1,11 @@
|
|||
|
||||
add_executable(tgvpf tgvpf.cxx)
|
||||
|
||||
if(MSVC)
|
||||
set (WINMM_LIB winmm)
|
||||
endif(MSVC)
|
||||
|
||||
target_link_libraries(tgvpf
|
||||
Polygon Geometry Output poly2tri TriangleJRS vpf
|
||||
${SIMGEAR_CORE_LIBRARIES}
|
||||
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
|
||||
${GPC_LIBRARY}
|
||||
${WINMM_LIB})
|
||||
${RT_LIBRARY})
|
||||
|
||||
install(TARGETS tgvpf RUNTIME DESTINATION bin)
|
||||
|
|
Loading…
Add table
Reference in a new issue