From f960427368f5225241440422978807deed616bf1 Mon Sep 17 00:00:00 2001 From: Miriam Ruiz Date: Tue, 2 Dec 2008 21:39:33 +0100 Subject: [PATCH] Fix small problems in .la file --- cmake/MacroCreateLibtoolFile.cmake | 2 +- src/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/MacroCreateLibtoolFile.cmake b/cmake/MacroCreateLibtoolFile.cmake index 232228c..0bbd62b 100644 --- a/cmake/MacroCreateLibtoolFile.cmake +++ b/cmake/MacroCreateLibtoolFile.cmake @@ -24,6 +24,6 @@ MACRO(CREATE_LIBTOOL_FILE _target _install_DIR) FILE(APPEND ${_laname_abs} "# Should we warn about portability when linking against -modules?\nshouldnotlink=yes\n\n") FILE(APPEND ${_laname_abs} "# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n\n") FILE(APPEND ${_laname_abs} "# Directory that this library needs to be installed in:\n") - FILE(APPEND ${_laname_abs} "libdir='${CMAKE_INSTALL_PREFIX}${_install_DIR}'\n") + FILE(APPEND ${_laname_abs} "libdir='${CMAKE_INSTALL_PREFIX}/${_install_DIR}'\n") INSTALL_FILES(${_install_DIR} FILES ${_laname_abs}) ENDMACRO(CREATE_LIBTOOL_FILE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c905491..0245077 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,8 +15,8 @@ ADD_LIBRARY ( pango-shared SHARED ${SRCS} ) ADD_LIBRARY ( pango-static STATIC ${SRCS} ) SET_TARGET_PROPERTIES(pango-shared pango-static PROPERTIES OUTPUT_NAME SDL_Pango) SET_TARGET_PROPERTIES (pango-shared PROPERTIES VERSION ${SDLPANGO_VERSION} SOVERSION ${SDLPANGO_MAJOR}) -SET_TARGET_PROPERTIES(pango-shared PROPERTIES VERSION "${LIBPANGO_VERSION}") -SET_TARGET_PROPERTIES(pango-shared PROPERTIES SOVERSION "${LIBPANGO_MAJOR}") +SET_TARGET_PROPERTIES(pango-shared PROPERTIES VERSION "${SDLPANGO_VERSION}") +SET_TARGET_PROPERTIES(pango-shared PROPERTIES SOVERSION "${SDLPANGO_MAJOR}") INCLUDE(../cmake/MacroCreateLibtoolFile.cmake) CREATE_LIBTOOL_FILE(pango-shared lib) INSTALL ( TARGETS pango-shared -- 2.11.4.GIT