fly/flightgear
1
0
Fork 0
Code Activity

Merge /u/jbicha/flightgear/ branch next into next

Browse source 
https://sourceforge.net/p/flightgear/flightgear/merge-requests/49/
This commit is contained in:
James Turner 2016-07-11 09:04:58 +00:00
commit 2eb5e6f0f4
12 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.cmake
View file

@ -148,7 +148,7 @@ Adding a new executable target
add_executable(myexecutable ${SOURCES} ${HEADERS})
target_link_libraries(myexecutable .... libraries ... )
install(TARGETS myexecutable RUNTIME DESTINATION bin)
install(TARGETS myexecutable RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
(If the executable should not be installed, omit the final line above)

2
src/FDM/YASim/CMakeLists.txt
View file

@ -49,7 +49,7 @@ target_link_libraries(yasim-proptest
${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES})
install(TARGETS yasim yasim-proptest RUNTIME DESTINATION bin)
install(TARGETS yasim yasim-proptest RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif(ENABLE_TESTS)

4
src/Input/CMakeLists.txt
View file

@ -53,7 +53,7 @@ if(ENABLE_FGJS)
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
)
install(TARGETS fgjs RUNTIME DESTINATION bin)
install(TARGETS fgjs RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(ENABLE_JS_DEMO)
@ -64,7 +64,7 @@ if(ENABLE_JS_DEMO)
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
)
install(TARGETS js_demo RUNTIME DESTINATION bin)
install(TARGETS js_demo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
flightgear_component(Input "${SOURCES}" "${HEADERS}")

4
src/Main/CMakeLists.txt
View file

@ -162,7 +162,7 @@ endif()
if (APPLE)
install(TARGETS fgfs BUNDLE DESTINATION .)
else()
install(TARGETS fgfs RUNTIME DESTINATION bin)
install(TARGETS fgfs RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(ENABLE_METAR)
@ -174,5 +174,5 @@ if(ENABLE_METAR)
${PLATFORM_LIBS}
)
install(TARGETS metar RUNTIME DESTINATION bin)
install(TARGETS metar RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()

2
utils/GPSsmooth/CMakeLists.txt
View file

@ -38,4 +38,4 @@ target_link_libraries(UGsmooth
${ZLIB_LIBRARY}
)
install(TARGETS GPSsmooth MIDGsmooth UGsmooth RUNTIME DESTINATION bin)
install(TARGETS GPSsmooth MIDGsmooth UGsmooth RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

2
utils/TerraSync/CMakeLists.txt
View file

@ -6,4 +6,4 @@
# ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
#)
#install(TARGETS terrasync RUNTIME DESTINATION bin)
#install(TARGETS terrasync RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

2
utils/fgai/CMakeLists.txt
View file

@ -25,4 +25,4 @@ target_link_libraries(fgai
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
)
install(TARGETS fgai RUNTIME DESTINATION bin)
install(TARGETS fgai RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

2
utils/fgcom/CMakeLists.txt
View file

@ -31,4 +31,4 @@ target_link_Libraries(${name}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
)
install(TARGETS ${name} RUNTIME DESTINATION bin)
install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

2
utils/fgelev/CMakeLists.txt
View file

@ -8,4 +8,4 @@ target_link_libraries(fgelev
${ZLIB_LIBRARY}
)
install(TARGETS fgelev RUNTIME DESTINATION bin)
install(TARGETS fgelev RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

2
utils/fgpanel/CMakeLists.txt
View file

@ -35,7 +35,7 @@ if(GLUT_FOUND)
include_directories(${PNG_INCLUDE_DIR})
install(TARGETS fgpanel RUNTIME DESTINATION bin)
install(TARGETS fgpanel RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
else()
message(STATUS "glut NOT found, can't build fgpanel")
endif()

2
utils/fgviewer/CMakeLists.txt
View file

@ -53,4 +53,4 @@ target_link_libraries(fgviewer
${FGVIEWER_RTI_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
)
install(TARGETS fgviewer RUNTIME DESTINATION bin)
install(TARGETS fgviewer RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

2
utils/stgmerge/CMakeLists.txt
View file

@ -7,4 +7,4 @@ target_link_libraries(stgmerge
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
)
install(TARGETS stgmerge RUNTIME DESTINATION bin)
install(TARGETS stgmerge RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})