Use CMAKE_INSTALL_BINDIR

Allow /bin install directory to be overriden. Debian for example uses this
to install FlightGear to /usr/games/ instead of /usr/bin/

https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html

diff --git a/README.cmake b/README.cmake
index 767f9c779c6a3bf476c13963a5da2c6f89a3ef8f..863c2e77a9ac9078b1b5721d721a417fab43ac59 100644 (file)
--- a/README.cmake
+++ b/README.cmake
@@ -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)
 

diff --git a/src/FDM/YASim/CMakeLists.txt b/src/FDM/YASim/CMakeLists.txt
index 97a8e2581c0fc0ed711fe84e7a7dc0ad41753647..506f7a0109e0af87badd919aa0218691c29db43d 100644 (file)
--- a/src/FDM/YASim/CMakeLists.txt
+++ b/src/FDM/YASim/CMakeLists.txt
@@ -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)
 

diff --git a/src/Input/CMakeLists.txt b/src/Input/CMakeLists.txt
index 11b277ef2fb2777511a3684aee4c8dfbe6424be0..3a0c85efbd1673fc9d874bc24f552fc19291a378 100644 (file)
--- a/src/Input/CMakeLists.txt
+++ b/src/Input/CMakeLists.txt
@@ -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}")
\ No newline at end of file

diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt
index 4ea0fe523bf115bab90c07eafa1191e66c10563d..3ae88d1db06f858d173a9e65acadd307754de7d7 100644 (file)
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -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()

diff --git a/utils/GPSsmooth/CMakeLists.txt b/utils/GPSsmooth/CMakeLists.txt
index a76c9521d501dc0740cc2eb1192b1de383dd55b7..82bb89abf246a8214491f09d95eacc6aed0179ae 100644 (file)
--- a/utils/GPSsmooth/CMakeLists.txt
+++ b/utils/GPSsmooth/CMakeLists.txt
@@ -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})

diff --git a/utils/TerraSync/CMakeLists.txt b/utils/TerraSync/CMakeLists.txt
index f97996a9a8fa7cd78b75cb4411f574bce2ad073c..826a97ac97c662959a047ba83dac89cb54af1f43 100644 (file)
--- a/utils/TerraSync/CMakeLists.txt
+++ b/utils/TerraSync/CMakeLists.txt
@@ -6,4 +6,4 @@
 #      ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
 #)
 
-#install(TARGETS terrasync RUNTIME DESTINATION bin)
+#install(TARGETS terrasync RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/utils/fgai/CMakeLists.txt b/utils/fgai/CMakeLists.txt
index 3b234a4c363bfad9bff5a2597b8492d36845e82a..fc65438c4d75e5af05ebbf3d73782327e6a0c256 100644 (file)
--- a/utils/fgai/CMakeLists.txt
+++ b/utils/fgai/CMakeLists.txt
@@ -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})

diff --git a/utils/fgcom/CMakeLists.txt b/utils/fgcom/CMakeLists.txt
index bfa43e323fe7e53d4ec373672aa7e8eb24bf55c1..c9e9b6d9514e4167460855feb54bedea26793f58 100644 (file)
--- a/utils/fgcom/CMakeLists.txt
+++ b/utils/fgcom/CMakeLists.txt
@@ -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})

diff --git a/utils/fgelev/CMakeLists.txt b/utils/fgelev/CMakeLists.txt
index 13d6d38505eae5063c8b9a4941d1e859f9273c34..c8a7e79e8e81fd5e0ca93c840cecc8bd3d4d7ec0 100644 (file)
--- a/utils/fgelev/CMakeLists.txt
+++ b/utils/fgelev/CMakeLists.txt
@@ -8,4 +8,4 @@ target_link_libraries(fgelev
         ${ZLIB_LIBRARY}
 )
 
-install(TARGETS fgelev RUNTIME DESTINATION bin)
+install(TARGETS fgelev RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/utils/fgpanel/CMakeLists.txt b/utils/fgpanel/CMakeLists.txt
index f7ac79ca1a82a08f24fde8fdbc94dcc434d9b492..51bb7ad2a00c6aedb88d44b979eb4d7ff0624ea7 100644 (file)
--- a/utils/fgpanel/CMakeLists.txt
+++ b/utils/fgpanel/CMakeLists.txt
@@ -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()

diff --git a/utils/fgviewer/CMakeLists.txt b/utils/fgviewer/CMakeLists.txt
index bfc52ad50aa68e3887ab89be28458a6276659f39..1cf6653c52be2bf3d8476718db6343110c9c115f 100644 (file)
--- a/utils/fgviewer/CMakeLists.txt
+++ b/utils/fgviewer/CMakeLists.txt
@@ -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})

diff --git a/utils/stgmerge/CMakeLists.txt b/utils/stgmerge/CMakeLists.txt
index ef694f690e0bde9ca1cddfe60965d869babbbe65..d6d14ff7229a966747bef21ccfb1204373c8f672 100644 (file)
--- a/utils/stgmerge/CMakeLists.txt
+++ b/utils/stgmerge/CMakeLists.txt
@@ -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})