diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/scripts/android/PathSetup.cmake | 4 | ||||
| -rw-r--r-- | cmake/scripts/linux/PathSetup.cmake | 4 | ||||
| -rw-r--r-- | cmake/scripts/osx/PathSetup.cmake | 4 | ||||
| -rw-r--r-- | cmake/scripts/windows/PathSetup.cmake | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cf04bc1738..664f6bca76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,7 @@ include(cmake/scripts/common/AddOptions.cmake) include(cmake/scripts/common/ArchSetup.cmake) include(cmake/scripts/common/Macros.cmake) include(cmake/scripts/common/ProjectMacros.cmake) +core_find_versions() include(cmake/scripts/${CORE_SYSTEM_NAME}/PathSetup.cmake) include(ExternalProject) @@ -76,7 +77,6 @@ else() endif() core_find_git_rev(APP_SCMID FULL) -core_find_versions() # Dynamically loaded libraries built with the project add_custom_target(${APP_NAME_LC}-libraries) diff --git a/cmake/scripts/android/PathSetup.cmake b/cmake/scripts/android/PathSetup.cmake index 69de88318e..1274fcfa76 100644 --- a/cmake/scripts/android/PathSetup.cmake +++ b/cmake/scripts/android/PathSetup.cmake @@ -29,5 +29,5 @@ list(APPEND final_message "Includedir: ${includedir}") list(APPEND final_message "Datarootdir: ${datarootdir}") list(APPEND final_message "Datadir: ${datadir}") -set(PATH_DEFINES -DBIN_INSTALL_PATH=\"${libdir}/kodi\" - -DINSTALL_PATH=\"${datarootdir}/kodi\") +set(PATH_DEFINES -DBIN_INSTALL_PATH=\"${libdir}/${APP_NAME_LC}\" + -DINSTALL_PATH=\"${datarootdir}/${APP_NAME_LC}\") diff --git a/cmake/scripts/linux/PathSetup.cmake b/cmake/scripts/linux/PathSetup.cmake index 5532c2d962..f9f78ba622 100644 --- a/cmake/scripts/linux/PathSetup.cmake +++ b/cmake/scripts/linux/PathSetup.cmake @@ -36,5 +36,5 @@ list(APPEND final_message "Datarootdir: ${datarootdir}") list(APPEND final_message "Datadir: ${datadir}") list(APPEND final_message "Docdir: ${docdir}") -set(PATH_DEFINES -DBIN_INSTALL_PATH=\"${libdir}/kodi\" - -DINSTALL_PATH=\"${datarootdir}/kodi\") +set(PATH_DEFINES -DBIN_INSTALL_PATH=\"${libdir}/${APP_NAME_LC}\" + -DINSTALL_PATH=\"${datarootdir}/${APP_NAME_LC}\") diff --git a/cmake/scripts/osx/PathSetup.cmake b/cmake/scripts/osx/PathSetup.cmake index 071dfd45ea..ddb417697e 100644 --- a/cmake/scripts/osx/PathSetup.cmake +++ b/cmake/scripts/osx/PathSetup.cmake @@ -28,5 +28,5 @@ list(APPEND final_message "Includedir: ${includedir}") list(APPEND final_message "Datarootdir: ${datarootdir}") list(APPEND final_message "Datadir: ${datadir}") -set(PATH_DEFINES -DBIN_INSTALL_PATH=\"${libdir}/kodi\" - -DINSTALL_PATH=\"${datarootdir}/kodi\") +set(PATH_DEFINES -DBIN_INSTALL_PATH=\"${libdir}/${APP_NAME_LC}\" + -DINSTALL_PATH=\"${datarootdir}/${APP_NAME_LC}\") diff --git a/cmake/scripts/windows/PathSetup.cmake b/cmake/scripts/windows/PathSetup.cmake index 8550616cd7..f6defdeae7 100644 --- a/cmake/scripts/windows/PathSetup.cmake +++ b/cmake/scripts/windows/PathSetup.cmake @@ -30,5 +30,5 @@ list(APPEND final_message "Includedir: ${includedir}") list(APPEND final_message "Datarootdir: ${datarootdir}") list(APPEND final_message "Datadir: ${datadir}") -set(PATH_DEFINES -DBIN_INSTALL_PATH=\"${libdir}/kodi\" - -DINSTALL_PATH=\"${datarootdir}/kodi\") +set(PATH_DEFINES -DBIN_INSTALL_PATH=\"${libdir}/${APP_NAME_LC}\" + -DINSTALL_PATH=\"${datarootdir}/${APP_NAME_LC}\") |