[Kde-bindings] [smokeqt] /: apply a patch from Steven Boswell to fix building on Windows.
Arno Rehn
arno at arnorehn.de
Sat Dec 17 13:18:08 UTC 2011
Git commit 0dbc64ca7abde11d412e785c40d51b6471ade3e7 by Arno Rehn.
Committed on 17/12/2011 at 14:17.
Pushed by arnorehn into branch 'master'.
apply a patch from Steven Boswell to fix building on Windows.
CCMAIL: kde-bindings at kde.org
M +6 -1 CMakeLists.txt
M +9 -2 phonon/CMakeLists.txt
M +10 -2 qimageblitz/CMakeLists.txt
M +9 -2 qsci/CMakeLists.txt
M +13 -4 qt3support/CMakeLists.txt
M +12 -4 qtcore/CMakeLists.txt
M +12 -4 qtdbus/CMakeLists.txt
M +0 -1 qtdbus/smokeconfig.xml
M +13 -4 qtdeclarative/CMakeLists.txt
M +12 -4 qtgui/CMakeLists.txt
M +12 -4 qthelp/CMakeLists.txt
M +13 -4 qtmultimedia/CMakeLists.txt
M +13 -4 qtnetwork/CMakeLists.txt
M +12 -4 qtopengl/CMakeLists.txt
M +11 -3 qtscript/CMakeLists.txt
M +12 -4 qtsql/CMakeLists.txt
M +12 -4 qtsvg/CMakeLists.txt
M +12 -2 qttest/CMakeLists.txt
M +13 -2 qtuitools/CMakeLists.txt
M +10 -2 qtwebkit/CMakeLists.txt
M +12 -4 qtxml/CMakeLists.txt
M +13 -4 qtxmlpatterns/CMakeLists.txt
M +12 -2 qwt/CMakeLists.txt
http://commits.kde.org/smokeqt/0dbc64ca7abde11d412e785c40d51b6471ade3e7
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3798103..31736c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,13 +6,18 @@ add_definitions(-DSMOKE_BUILDING)
find_package(Qt4 REQUIRED)
find_package(Smoke)
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SMOKE_CMAKE_MODULE_DIR})
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${SMOKE_CMAKE_MODULE_DIR}")
include(MacroOptionalFindPackage)
include(MacroOptionalAddBindings)
include(MacroLogFeature)
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${SMOKE_INCLUDE_DIR})
+# Set LIB_INSTALL_DIR if it's not set already.
+if (NOT LIB_INSTALL_DIR)
+ set (LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+endif (NOT LIB_INSTALL_DIR)
+
macro_optional_find_package(QImageBlitz)
macro_log_feature(QIMAGEBLITZ_FOUND "QImageBlitz" "QImageBlitz library" "http://www.kde.org" FALSE "" "Needed to compile QImageBlitz bindings")
diff --git a/phonon/CMakeLists.txt b/phonon/CMakeLists.txt
index addf534..190a594 100644
--- a/phonon/CMakeLists.txt
+++ b/phonon/CMakeLists.txt
@@ -21,7 +21,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qtcore/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-I "${PHONON_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/phonon_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -49,5 +50,11 @@ target_link_libraries(smokephonon smokeqtcore smokeqtgui ${QT_QTCORE_LIBS} ${QT_
set_target_properties(smokephonon PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokephonon DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokephonon LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokephonon PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../phonon_smoke.h DESTINATION include/smoke)
diff --git a/qimageblitz/CMakeLists.txt b/qimageblitz/CMakeLists.txt
index 01a3ac9..0803568 100644
--- a/qimageblitz/CMakeLists.txt
+++ b/qimageblitz/CMakeLists.txt
@@ -10,7 +10,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qtcore/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-I ${QIMAGEBLITZ_INCLUDES} -- ${CMAKE_CURRENT_SOURCE_DIR}/qimageblitz_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -28,5 +29,12 @@ target_link_libraries(smokeqimageblitz smokeqtcore ${QT_QTCORE_LIBRARY} ${QT_QTG
set_target_properties(smokeqimageblitz PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokeqimageblitz DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqimageblitz
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqimageblitz PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qimageblitz_smoke.h DESTINATION include/smoke )
diff --git a/qsci/CMakeLists.txt b/qsci/CMakeLists.txt
index 6b6a1a7..da706c5 100644
--- a/qsci/CMakeLists.txt
+++ b/qsci/CMakeLists.txt
@@ -19,7 +19,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qtgui/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-I "${QSCINTILLA_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/qscintilla2_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -44,5 +45,11 @@ target_link_libraries(smokeqsci smokeqtcore smokeqtgui ${QT_QTCORE_LIBRARY} ${QT
set_target_properties(smokeqsci PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokeqsci DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqsci LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqsci PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qsci_smoke.h DESTINATION include/smoke)
diff --git a/qt3support/CMakeLists.txt b/qt3support/CMakeLists.txt
index 60234aa..4f1d551 100644
--- a/qt3support/CMakeLists.txt
+++ b/qt3support/CMakeLists.txt
@@ -31,7 +31,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qt3support_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -83,7 +84,15 @@ target_link_libraries(
set_target_properties(smokeqt3support PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqt3support DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqt3support
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+# Get rid of the "lib" prefix on archives/DLLs in Windows.
+if (WIN32)
+ set_target_properties(smokeqt3support
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qt3support_smoke.h DESTINATION include/smoke)
diff --git a/qtcore/CMakeLists.txt b/qtcore/CMakeLists.txt
index b648d98..d1e5a2d 100644
--- a/qtcore/CMakeLists.txt
+++ b/qtcore/CMakeLists.txt
@@ -40,7 +40,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtcore_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -80,9 +81,16 @@ target_link_libraries(smokeqtcore ${QT_QTCORE_LIBRARY} ${SMOKE_BASE_LIBRARY} )
set_target_properties(smokeqtcore PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtcore DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtcore LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtcore
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtcore_smoke.h DESTINATION include/smoke)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qt-config.xml DESTINATION share/smokegen)
install(FILES ${QTDEFINES_FILE} DESTINATION share/smokegen)
diff --git a/qtdbus/CMakeLists.txt b/qtdbus/CMakeLists.txt
index 81ebef6..e70a081 100644
--- a/qtdbus/CMakeLists.txt
+++ b/qtdbus/CMakeLists.txt
@@ -11,7 +11,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtdbus_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -32,7 +33,14 @@ target_link_libraries(smokeqtdbus smokeqtcore ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_L
set_target_properties(smokeqtdbus PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtdbus DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtdbus LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtdbus
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtdbus_smoke.h DESTINATION include/smoke)
diff --git a/qtdbus/smokeconfig.xml b/qtdbus/smokeconfig.xml
index 1be2b5f..463b0b4 100644
--- a/qtdbus/smokeconfig.xml
+++ b/qtdbus/smokeconfig.xml
@@ -48,7 +48,6 @@
<class>QDBusContext</class>
<class>QDBusDemarshaller</class>
<class>QDBusError</class>
- <class>QDBusUnixFileDescriptor</class>
<class>QDBusInterface</class>
<class>QDBusMarshaller</class>
<class>QDBusMessage</class>
diff --git a/qtdeclarative/CMakeLists.txt b/qtdeclarative/CMakeLists.txt
index a675581..28b5182 100644
--- a/qtdeclarative/CMakeLists.txt
+++ b/qtdeclarative/CMakeLists.txt
@@ -11,7 +11,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtdeclarative_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -39,7 +40,15 @@ target_link_libraries( smokeqtdeclarative
set_target_properties(smokeqtdeclarative PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtdeclarative DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtdeclarative
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtdeclarative
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtdeclarative_smoke.h DESTINATION include/smoke)
diff --git a/qtgui/CMakeLists.txt b/qtgui/CMakeLists.txt
index 7a3bff1..34470b2 100644
--- a/qtgui/CMakeLists.txt
+++ b/qtgui/CMakeLists.txt
@@ -30,7 +30,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtgui_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -70,7 +71,14 @@ target_link_libraries(smokeqtgui smokeqtcore ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIB
set_target_properties(smokeqtgui PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtgui DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtgui LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtgui
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtgui_smoke.h DESTINATION include/smoke)
diff --git a/qthelp/CMakeLists.txt b/qthelp/CMakeLists.txt
index f0c77e0..87de102 100644
--- a/qthelp/CMakeLists.txt
+++ b/qthelp/CMakeLists.txt
@@ -11,7 +11,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qthelp_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -39,7 +40,14 @@ target_link_libraries(smokeqthelp
set_target_properties(smokeqthelp PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqthelp DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqthelp LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqthelp
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qthelp_smoke.h DESTINATION include/smoke)
diff --git a/qtmultimedia/CMakeLists.txt b/qtmultimedia/CMakeLists.txt
index 69ff22a..8a6ad25 100644
--- a/qtmultimedia/CMakeLists.txt
+++ b/qtmultimedia/CMakeLists.txt
@@ -11,7 +11,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtmultimedia_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -36,7 +37,15 @@ target_link_libraries( smokeqtmultimedia
set_target_properties(smokeqtmultimedia PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtmultimedia DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtmultimedia
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtmultimedia
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtmultimedia_smoke.h DESTINATION include/smoke)
diff --git a/qtnetwork/CMakeLists.txt b/qtnetwork/CMakeLists.txt
index 5798131..a4b7391 100644
--- a/qtnetwork/CMakeLists.txt
+++ b/qtnetwork/CMakeLists.txt
@@ -11,7 +11,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtnetwork_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -32,7 +33,15 @@ target_link_libraries(smokeqtnetwork smokeqtcore ${QT_QTCORE_LIBRARY} ${QT_QTNET
set_target_properties(smokeqtnetwork PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtnetwork DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtnetwork
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtnetwork
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtnetwork_smoke.h DESTINATION include/smoke)
diff --git a/qtopengl/CMakeLists.txt b/qtopengl/CMakeLists.txt
index 3a4ae62..ac59182 100644
--- a/qtopengl/CMakeLists.txt
+++ b/qtopengl/CMakeLists.txt
@@ -10,7 +10,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtopengl_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -36,7 +37,14 @@ target_link_libraries(smokeqtopengl
set_target_properties(smokeqtopengl PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtopengl DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtopengl LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtopengl
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtopengl_smoke.h DESTINATION include/smoke)
diff --git a/qtscript/CMakeLists.txt b/qtscript/CMakeLists.txt
index e390638..b56c15a 100644
--- a/qtscript/CMakeLists.txt
+++ b/qtscript/CMakeLists.txt
@@ -1,4 +1,3 @@
-
include_directories( ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} )
configure_file(config.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.xml @ONLY)
@@ -9,7 +8,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtscript_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -27,5 +27,13 @@ target_link_libraries(smokeqtscript smokeqtcore ${QT_QTCORE_LIBRARY} ${QT_QTSCRI
set_target_properties(smokeqtscript PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokeqtscript DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtscript LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtscript
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtscript_smoke.h DESTINATION include/smoke )
diff --git a/qtsql/CMakeLists.txt b/qtsql/CMakeLists.txt
index 6a286c3..b233694 100644
--- a/qtsql/CMakeLists.txt
+++ b/qtsql/CMakeLists.txt
@@ -11,7 +11,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtsql_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -39,7 +40,14 @@ target_link_libraries(smokeqtsql
set_target_properties(smokeqtsql PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtsql DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtsql LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtsql
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtsql_smoke.h DESTINATION include/smoke)
diff --git a/qtsvg/CMakeLists.txt b/qtsvg/CMakeLists.txt
index 497dc75..9db82fd 100644
--- a/qtsvg/CMakeLists.txt
+++ b/qtsvg/CMakeLists.txt
@@ -11,7 +11,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtsvg_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -37,7 +38,14 @@ target_link_libraries(smokeqtsvg
set_target_properties(smokeqtsvg PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtsvg DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtsvg LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtsvg
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtsvg_smoke.h DESTINATION include/smoke)
diff --git a/qttest/CMakeLists.txt b/qttest/CMakeLists.txt
index a2f6dd8..e5dca95 100644
--- a/qttest/CMakeLists.txt
+++ b/qttest/CMakeLists.txt
@@ -8,7 +8,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qttest_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -31,5 +32,14 @@ target_link_libraries( smokeqttest
set_target_properties(smokeqttest PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokeqttest DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqttest LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqttest
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qttest_smoke.h DESTINATION include/smoke)
diff --git a/qtuitools/CMakeLists.txt b/qtuitools/CMakeLists.txt
index dd92442..c689a49 100644
--- a/qtuitools/CMakeLists.txt
+++ b/qtuitools/CMakeLists.txt
@@ -8,7 +8,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtuitools_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -26,5 +27,15 @@ target_link_libraries(smokeqtuitools smokeqtcore smokeqtgui ${QT_QTCORE_LIBRARY}
set_target_properties(smokeqtuitools PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokeqtuitools DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtuitools
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtuitools
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtuitools_smoke.h DESTINATION include/smoke)
diff --git a/qtwebkit/CMakeLists.txt b/qtwebkit/CMakeLists.txt
index 793c3bd..32c6e84 100644
--- a/qtwebkit/CMakeLists.txt
+++ b/qtwebkit/CMakeLists.txt
@@ -8,7 +8,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtwebkit_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -31,5 +32,12 @@ target_link_libraries( smokeqtwebkit
set_target_properties(smokeqtwebkit PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokeqtwebkit DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtwebkit LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtwebkit PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtwebkit_smoke.h DESTINATION include/smoke )
diff --git a/qtxml/CMakeLists.txt b/qtxml/CMakeLists.txt
index a5320aa..b599ba7 100644
--- a/qtxml/CMakeLists.txt
+++ b/qtxml/CMakeLists.txt
@@ -11,7 +11,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtxml_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -35,7 +36,14 @@ target_link_libraries(smokeqtxml
set_target_properties(smokeqtxml PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtxml DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtxml LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtxml
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtxml_smoke.h DESTINATION include/smoke)
diff --git a/qtxmlpatterns/CMakeLists.txt b/qtxmlpatterns/CMakeLists.txt
index 0bd28da..a7a558c 100644
--- a/qtxmlpatterns/CMakeLists.txt
+++ b/qtxmlpatterns/CMakeLists.txt
@@ -11,7 +11,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-- ${CMAKE_CURRENT_SOURCE_DIR}/qtxmlpatterns_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -36,7 +37,15 @@ target_link_libraries(smokeqtxmlpatterns
set_target_properties(smokeqtxmlpatterns PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-# Don't use the KDE ${LIB_INSTALL_DIR} macro here as this file is
-# for Qt only installs
-install(TARGETS smokeqtxmlpatterns DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqtxmlpatterns
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqtxmlpatterns
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qtxmlpatterns_smoke.h DESTINATION include/smoke)
diff --git a/qwt/CMakeLists.txt b/qwt/CMakeLists.txt
index b5754d2..f190bfe 100644
--- a/qwt/CMakeLists.txt
+++ b/qwt/CMakeLists.txt
@@ -19,7 +19,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp
COMMAND ${SMOKE_GEN_BIN}
ARGS -config "${CMAKE_CURRENT_BINARY_DIR}/../qtgui/config.xml" -smokeconfig "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
-I "${Qwt5_INCLUDE_DIR}" -- ${CMAKE_CURRENT_SOURCE_DIR}/qwt_includes.h
- DEPENDS ${SMOKE_GEN_BIN} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+ DEPENDS ${SMOKE_GEN_BIN} "${CMAKE_CURRENT_SOURCE_DIR}/smokeconfig.xml"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
macro_add_file_dependencies( ${CMAKE_CURRENT_BINARY_DIR}/smokedata.cpp ${CMAKE_CURRENT_BINARY_DIR}/x_1.cpp )
@@ -44,5 +45,14 @@ target_link_libraries(smokeqwt smokeqtcore smokeqtgui ${QT_QTCORE_LIBRARY} ${QT_
set_target_properties(smokeqwt PROPERTIES VERSION 3.0.0 SOVERSION 3 )
-install(TARGETS smokeqwt DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+install(TARGETS smokeqwt LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+ RUNTIME DESTINATION bin)
+
+if (WIN32)
+ # Get rid of the "lib" prefix on archives/DLLs in Windows.
+ set_target_properties(smokeqwt
+ PROPERTIES PREFIX "" IMPORT_PREFIX "")
+endif (WIN32)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qwt_smoke.h DESTINATION include/smoke)
More information about the Kde-bindings
mailing list