diff options
| author | Jörg Krause <joerg.krause@embedded.rocks> | 2019-05-17 13:13:35 +0200 |
|---|---|---|
| committer | Stephen F. Booth <me@sbooth.org> | 2019-05-17 15:43:35 +0430 |
| commit | 7470f92a67375d00e53b3785a88fa7b26ad6f1da (patch) | |
| tree | d0eca63b10b1f20d78a327550ed53bc5d3b2c819 | |
| parent | 6455671ecef7014ee83e91e1fd4e1f9b93dff53a (diff) | |
fix taglib-config file for cross compiling (#906)
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | taglib-config.cmake | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2de06324..1a0302c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,7 +105,7 @@ math(EXPR TAGLIB_SOVERSION_PATCH "${TAGLIB_SOVERSION_REVISION}") include(ConfigureChecks.cmake) if(NOT WIN32) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib-config") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib-config" @ONLY) install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config" DESTINATION "${BIN_INSTALL_DIR}") endif() diff --git a/taglib-config.cmake b/taglib-config.cmake index 2bc2811a..96ef6883 100644 --- a/taglib-config.cmake +++ b/taglib-config.cmake @@ -14,10 +14,10 @@ EOH exit 1; } -prefix=${CMAKE_INSTALL_PREFIX} -exec_prefix=${CMAKE_INSTALL_PREFIX} -libdir=${LIB_INSTALL_DIR} -includedir=${INCLUDE_INSTALL_DIR} +prefix=@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@ +libdir=${exec_prefix}/lib +includedir=${prefix}/include flags="" @@ -35,7 +35,7 @@ do flags="$flags -I$includedir/taglib" ;; --version) - echo ${TAGLIB_LIB_VERSION_STRING} + echo @TAGLIB_LIB_VERSION_STRING@ ;; --prefix) echo $prefix |