aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xam2cmake4
-rw-r--r--modules/KDE4Macros.cmake4
2 files changed, 4 insertions, 4 deletions
diff --git a/am2cmake b/am2cmake
index 3d11a880..611b50e1 100755
--- a/am2cmake
+++ b/am2cmake
@@ -850,10 +850,10 @@ class CMakeFile
elsif buildTarget.type==Part
if buildTarget.stdPrefix
file.printf("kde4_add_plugin(%s WITH_PREFIX ${%s})\n\n", buildTarget.name, srcsName)
- file.printf("kde4_create_libtool_file( %s / )\n\n", buildTarget.name)
+ file.printf("kde4_create_libtool_file( %s /kde4/ )\n\n", buildTarget.name)
else
file.printf("kde4_add_plugin(%s ${%s})\n\n", buildTarget.name, srcsName)
- file.printf("kde4_create_libtool_file( %s / )\n\n", buildTarget.name)
+ file.printf("kde4_create_libtool_file( %s /kde4/ )\n\n", buildTarget.name)
end
file.printf("target_link_libraries(%s ", buildTarget.name)
buildTarget.libs.each { |currentLib| file.printf(" %s", currentLib) }
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index 43d6eba9..d8566dab 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -393,9 +393,9 @@ MACRO(KDE4_CREATE_LIBTOOL_FILE _target _subdir)
FILE(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\nshouldnotlink=yes\n")
FILE(APPEND ${_laname} "# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n")
FILE(APPEND ${_laname} "# Directory that this library needs to be installed in:\n")
- FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/${KDE4_LIB_INSTALL_DIR}/kde4/${_subdir}'\n")
+ FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/${KDE4_LIB_INSTALL_DIR}/${_subdir}'\n")
- INSTALL_FILES(${KDE4_LIB_INSTALL_DIR}/kde4/${_subdir} FILES ${_laname})
+ INSTALL_FILES(${KDE4_LIB_INSTALL_DIR}/${_subdir} FILES ${_laname})
ENDMACRO(KDE4_CREATE_LIBTOOL_FILE)