[kdelibs/frameworks] libinqt5/src: Trying to make this temporary lib a real frameworks lib, to fix cmake

David Faure faure at kde.org
Wed Nov 2 13:37:21 UTC 2011


Git commit 4fbae126854f8f2ecd874dcc11251c744fd19b00 by David Faure.
Committed on 02/11/2011 at 15:38.
Pushed by dfaure into branch 'frameworks'.

Trying to make this temporary lib a real frameworks lib, to fix cmake

CMake Error: INSTALL(EXPORT "kcoreaddonsLibraryTargets" ...) includes target "kcoreaddons" which requires target "inqt5" that is not in the export set.

But the error is still here, I don't get it. Help!
CCMAIL: kde-buildsystem at kde.org

M  +15   -5    libinqt5/src/CMakeLists.txt

http://commits.kde.org/kdelibs/4fbae126854f8f2ecd874dcc11251c744fd19b00

diff --git a/libinqt5/src/CMakeLists.txt b/libinqt5/src/CMakeLists.txt
index 1f7fd00..5e4fc68 100644
--- a/libinqt5/src/CMakeLists.txt
+++ b/libinqt5/src/CMakeLists.txt
@@ -1,4 +1,14 @@
-project(libinqt5)
+project(inqt5)
+
+find_package(extra-cmake-modules REQUIRED)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${EXTRA_CMAKE_MODULES_MODULE_PATH})
+
+include(ECMVersion)
+# -- Maintained by scripty
+ecm_version(5 0 0)
+# --
+include(ECMQtFramework)
 
 include_directories(
     ${QT_INCLUDES}
@@ -13,15 +23,15 @@ set(libinqt5_SRCS
 # TODO windows: qstandardpaths_win.cpp
 # TODO mac: qstandardpaths_mac.cpp
 
-kf5_add_library(inqt5 ${LIBRARY_TYPE} ${libinqt5_SRCS})
+add_library(inqt5 ${LIBRARY_TYPE} ${libinqt5_SRCS})
 
 target_link_libraries(inqt5 ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
 
-set_target_properties(inqt5 PROPERTIES VERSION   ${GENERIC_LIB_VERSION}
-                                       SOVERSION ${GENERIC_LIB_SOVERSION}
+set_target_properties(inqt5 PROPERTIES VERSION   ${ECM_VERSION_STRING}
+                                       SOVERSION ${ECM_SOVERSION}
 )
 
-install(TARGETS inqt5 ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS inqt5 ${ECM_TARGET_DEFAULT_ARGS})
 
 #install(FILES
 #    qstandardpaths.h


More information about the Kde-buildsystem mailing list