--- a/cmake/FindPhononInternal.cmake +++ b/cmake/FindPhononInternal.cmake @@ -64,13 +64,6 @@ include(${phonon_cmake_module_dir}/Macro include(GNUInstallDirs) -set(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_FULL_DATAROOTDIR}") # CACHE PATH "Base directory for files which go to share/") -set(INCLUDE_INSTALL_DIR "include" ) # CACHE PATH "The subdirectory to the header prefix") -if (PHONON_BUILD_PHONON4QT5) - set(INCLUDE_INSTALL_DIR "include/${PHONON_LIB_SONAME}" ) # CACHE PATH "The subdirectory to the header prefix") -endif (PHONON_BUILD_PHONON4QT5) -set(BIN_INSTALL_DIR "bin" ) # CACHE PATH "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)") -set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" ) # CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed" set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/kde4" CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)") if (PHONON_BUILD_PHONON4QT5) set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt5" CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/qt5)" FORCE) --- a/PhononConfig.cmake.in +++ b/PhononConfig.cmake.in @@ -4,7 +4,7 @@ set(PHONON_VERSION "@PHONON_LIB_MAJOR_VERSION@.@PHONON_LIB_MINOR_VERSION@.@PHONON_LIB_PATCH_VERSION@") get_filename_component(currentDir ${CMAKE_CURRENT_LIST_FILE} PATH) # get the directory where I myself am -get_filename_component(rootDir ${currentDir}/@relInstallDir@ ABSOLUTE) # get the chosen install prefix +get_filename_component(rootDir "" ABSOLUTE) # get the chosen install prefix @USR_SYMLINK_RESOLVER@ set(PHONON_NO_GRAPHICSVIEW @PHONON_NO_GRAPHICSVIEW@) --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -248,7 +248,7 @@ if("${absInstallDir}" MATCHES "^(/usr)?/ get_filename_component(_realCurr \"\${CMAKE_CURRENT_LIST_DIR}\" REALPATH) get_filename_component(_realOrig \"${absInstallDir}\" REALPATH) if(_realCurr STREQUAL _realOrig) - set(rootDir \"${CMAKE_INSTALL_PREFIX}\") + set(rootDir \"\") endif() unset(_realOrig) unset(_realCurr)")