[Kde-bindings] [smokeqt] /: add -mstackrealign on Windows

Arno Rehn arno at arnorehn.de
Sun May 27 13:10:10 UTC 2012


Git commit 0a6f76e151da048937be42c283fb89bd938ce284 by Arno Rehn.
Committed on 27/05/2012 at 15:09.
Pushed by arnorehn into branch 'master'.

add -mstackrealign on Windows

CCMAIL: kde-bindings at kde.org

M  +3    -0    phonon/CMakeLists.txt
M  +3    -0    qimageblitz/CMakeLists.txt
M  +3    -0    qsci/CMakeLists.txt
M  +4    -1    qt3support/CMakeLists.txt
M  +3    -0    qtcore/CMakeLists.txt
M  +6    -0    qtcore/tests/CMakeLists.txt
M  +3    -0    qtdbus/CMakeLists.txt
M  +3    -0    qtdeclarative/CMakeLists.txt
M  +3    -0    qtgui/CMakeLists.txt
M  +3    -0    qthelp/CMakeLists.txt
M  +3    -0    qtmultimedia/CMakeLists.txt
M  +3    -0    qtnetwork/CMakeLists.txt
M  +3    -0    qtopengl/CMakeLists.txt
M  +3    -0    qtscript/CMakeLists.txt
M  +3    -0    qtsql/CMakeLists.txt
M  +3    -0    qtsvg/CMakeLists.txt
M  +3    -0    qttest/CMakeLists.txt
M  +3    -0    qtuitools/CMakeLists.txt
M  +3    -0    qtwebkit/CMakeLists.txt
M  +3    -0    qtxml/CMakeLists.txt
M  +3    -0    qtxmlpatterns/CMakeLists.txt
M  +3    -0    qwt/CMakeLists.txt

http://commits.kde.org/smokeqt/0a6f76e151da048937be42c283fb89bd938ce284

diff --git a/phonon/CMakeLists.txt b/phonon/CMakeLists.txt
index 70c54ea..dc0220c 100644
--- a/phonon/CMakeLists.txt
+++ b/phonon/CMakeLists.txt
@@ -54,6 +54,9 @@ install(TARGETS smokephonon LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokephonon PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokephonon PROPERTIES PREFIX "" IMPORT_PREFIX "")
 endif (WIN32)
diff --git a/qimageblitz/CMakeLists.txt b/qimageblitz/CMakeLists.txt
index 36b9cdf..f723cac 100644
--- a/qimageblitz/CMakeLists.txt
+++ b/qimageblitz/CMakeLists.txt
@@ -34,6 +34,9 @@ install(TARGETS smokeqimageblitz
     ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqimageblitz PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqimageblitz PROPERTIES PREFIX "" IMPORT_PREFIX "")
 endif (WIN32)
diff --git a/qsci/CMakeLists.txt b/qsci/CMakeLists.txt
index 4c146ed..8fd739e 100644
--- a/qsci/CMakeLists.txt
+++ b/qsci/CMakeLists.txt
@@ -49,6 +49,9 @@ install(TARGETS smokeqsci LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqsci PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqsci PROPERTIES PREFIX "" IMPORT_PREFIX "")
 endif (WIN32)
diff --git a/qt3support/CMakeLists.txt b/qt3support/CMakeLists.txt
index 5faff9a..1f28b63 100644
--- a/qt3support/CMakeLists.txt
+++ b/qt3support/CMakeLists.txt
@@ -89,8 +89,11 @@ install(TARGETS smokeqt3support
     ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 
-# Get rid of the "lib" prefix on archives/DLLs in Windows.
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqt3support PROPERTIES COMPILE_FLAGS -mstackrealign)
+
+	# Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqt3support
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
 endif (WIN32)
diff --git a/qtcore/CMakeLists.txt b/qtcore/CMakeLists.txt
index 9db6e64..18a9dcd 100644
--- a/qtcore/CMakeLists.txt
+++ b/qtcore/CMakeLists.txt
@@ -86,6 +86,9 @@ install(TARGETS smokeqtcore LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqtcore PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqtcore
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
diff --git a/qtcore/tests/CMakeLists.txt b/qtcore/tests/CMakeLists.txt
index 203ecde..51d1db3 100644
--- a/qtcore/tests/CMakeLists.txt
+++ b/qtcore/tests/CMakeLists.txt
@@ -10,4 +10,10 @@ include_directories(${QT_INCLUDES})
 # message(STATUS "Target test: ${test}")
 # add_definitions(-DTEST_${test})
 add_executable( target_test test.cpp )
+
+if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (target_test PROPERTIES COMPILE_FLAGS -mstackrealign)
+endif (WIN32)
+
 target_link_libraries( target_test ${QT_LIBRARIES} )
diff --git a/qtdbus/CMakeLists.txt b/qtdbus/CMakeLists.txt
index cf91da3..8d7f236 100644
--- a/qtdbus/CMakeLists.txt
+++ b/qtdbus/CMakeLists.txt
@@ -38,6 +38,9 @@ install(TARGETS smokeqtdbus LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqtdbus PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqtdbus
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
diff --git a/qtdeclarative/CMakeLists.txt b/qtdeclarative/CMakeLists.txt
index c04cff8..ae35767 100644
--- a/qtdeclarative/CMakeLists.txt
+++ b/qtdeclarative/CMakeLists.txt
@@ -46,6 +46,9 @@ install(TARGETS smokeqtdeclarative
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqtdeclarative PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqtdeclarative
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
diff --git a/qtgui/CMakeLists.txt b/qtgui/CMakeLists.txt
index 9f02ca4..e5f3625 100644
--- a/qtgui/CMakeLists.txt
+++ b/qtgui/CMakeLists.txt
@@ -76,6 +76,9 @@ install(TARGETS smokeqtgui LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqtgui PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqtgui
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
diff --git a/qthelp/CMakeLists.txt b/qthelp/CMakeLists.txt
index 54197b2..d6318b5 100644
--- a/qthelp/CMakeLists.txt
+++ b/qthelp/CMakeLists.txt
@@ -45,6 +45,9 @@ install(TARGETS smokeqthelp LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqthelp PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqthelp
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
diff --git a/qtmultimedia/CMakeLists.txt b/qtmultimedia/CMakeLists.txt
index 78e79af..0b19520 100644
--- a/qtmultimedia/CMakeLists.txt
+++ b/qtmultimedia/CMakeLists.txt
@@ -43,6 +43,9 @@ install(TARGETS smokeqtmultimedia
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqtmultimedia PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqtmultimedia
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
diff --git a/qtnetwork/CMakeLists.txt b/qtnetwork/CMakeLists.txt
index ca215d1..7c7675b 100644
--- a/qtnetwork/CMakeLists.txt
+++ b/qtnetwork/CMakeLists.txt
@@ -39,6 +39,9 @@ install(TARGETS smokeqtnetwork
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqtnetwork PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqtnetwork
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
diff --git a/qtopengl/CMakeLists.txt b/qtopengl/CMakeLists.txt
index 56b02e8..0273d74 100644
--- a/qtopengl/CMakeLists.txt
+++ b/qtopengl/CMakeLists.txt
@@ -42,6 +42,9 @@ install(TARGETS smokeqtopengl LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqtopengl PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqtopengl
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
diff --git a/qtscript/CMakeLists.txt b/qtscript/CMakeLists.txt
index ed232dd..d9e3b94 100644
--- a/qtscript/CMakeLists.txt
+++ b/qtscript/CMakeLists.txt
@@ -32,6 +32,9 @@ install(TARGETS smokeqtscript LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqtscript PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqtscript
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
diff --git a/qtsql/CMakeLists.txt b/qtsql/CMakeLists.txt
index d3d7205..54c2f27 100644
--- a/qtsql/CMakeLists.txt
+++ b/qtsql/CMakeLists.txt
@@ -45,6 +45,9 @@ install(TARGETS smokeqtsql LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqtsql PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqtsql
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
diff --git a/qtsvg/CMakeLists.txt b/qtsvg/CMakeLists.txt
index 4e8fbed..31c32c2 100644
--- a/qtsvg/CMakeLists.txt
+++ b/qtsvg/CMakeLists.txt
@@ -43,6 +43,9 @@ install(TARGETS smokeqtsvg LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqtsvg PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqtsvg
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
diff --git a/qttest/CMakeLists.txt b/qttest/CMakeLists.txt
index 14300a9..392cf14 100644
--- a/qttest/CMakeLists.txt
+++ b/qttest/CMakeLists.txt
@@ -37,6 +37,9 @@ install(TARGETS smokeqttest LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqttest PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqttest
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
diff --git a/qtuitools/CMakeLists.txt b/qtuitools/CMakeLists.txt
index 5880c1c..a29f41a 100644
--- a/qtuitools/CMakeLists.txt
+++ b/qtuitools/CMakeLists.txt
@@ -33,6 +33,9 @@ install(TARGETS smokeqtuitools
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqtuitools PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqtuitools
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
diff --git a/qtwebkit/CMakeLists.txt b/qtwebkit/CMakeLists.txt
index c48838c..837b9d3 100644
--- a/qtwebkit/CMakeLists.txt
+++ b/qtwebkit/CMakeLists.txt
@@ -36,6 +36,9 @@ install(TARGETS smokeqtwebkit LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqtwebkit PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqtwebkit PROPERTIES PREFIX "" IMPORT_PREFIX "")
 endif (WIN32)
diff --git a/qtxml/CMakeLists.txt b/qtxml/CMakeLists.txt
index 7c302c6..3eff161 100644
--- a/qtxml/CMakeLists.txt
+++ b/qtxml/CMakeLists.txt
@@ -41,6 +41,9 @@ install(TARGETS smokeqtxml LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqtxml PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqtxml
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
diff --git a/qtxmlpatterns/CMakeLists.txt b/qtxmlpatterns/CMakeLists.txt
index 7f42058..071e426 100644
--- a/qtxmlpatterns/CMakeLists.txt
+++ b/qtxmlpatterns/CMakeLists.txt
@@ -43,6 +43,9 @@ install(TARGETS smokeqtxmlpatterns
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqtxmlpatterns PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqtxmlpatterns
         PROPERTIES PREFIX "" IMPORT_PREFIX "")
diff --git a/qwt/CMakeLists.txt b/qwt/CMakeLists.txt
index 8ec91d1..7129386 100644
--- a/qwt/CMakeLists.txt
+++ b/qwt/CMakeLists.txt
@@ -50,6 +50,9 @@ install(TARGETS smokeqwt LIBRARY DESTINATION ${LIB_INSTALL_DIR}
     RUNTIME DESTINATION bin)
 
 if (WIN32)
+	# Realign the stack, for compatibility with an older ABI.
+	set_target_properties (smokeqwt PROPERTIES COMPILE_FLAGS -mstackrealign)
+
     # Get rid of the "lib" prefix on archives/DLLs in Windows.
     set_target_properties(smokeqwt
         PROPERTIES PREFIX "" IMPORT_PREFIX "")



More information about the Kde-bindings mailing list