[Kde-bindings] [smokegen] /: add -mstackrealign on Windows
Arno Rehn
arno at arnorehn.de
Sun May 27 13:09:13 UTC 2012
Git commit 6982ef735151445768bd9fc90346c0c54de33e17 by Arno Rehn.
Committed on 27/05/2012 at 15:08.
Pushed by arnorehn into branch 'master'.
add -mstackrealign on Windows
CCMAIL: kde-bindings at kde.org
M +3 -0 CMakeLists.txt
M +5 -0 deptool/CMakeLists.txt
M +5 -0 generators/dump/CMakeLists.txt
M +5 -0 generators/smoke/CMakeLists.txt
M +3 -0 parser/CMakeLists.txt
M +6 -0 parser/rpp/CMakeLists.txt
M +4 -0 parser/rpp/tests/CMakeLists.txt
M +16 -0 parser/tests/CMakeLists.txt
M +6 -0 smokeapi/CMakeLists.txt
M +3 -0 smokebase/CMakeLists.txt
http://commits.kde.org/smokegen/6982ef735151445768bd9fc90346c0c54de33e17
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79945c4..d907f44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,9 @@ install(TARGETS smokegen LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
if (WIN32)
+ # Realign the stack, for compatibility with an older ABI.
+ set_target_properties(smokegen PROPERTIES COMPILE_FLAGS -mstackrealign)
+
# Get rid of the "lib" prefix on archives/DLLs in Windows.
set_target_properties(smokegen PROPERTIES PREFIX "" IMPORT_PREFIX "")
endif (WIN32)
diff --git a/deptool/CMakeLists.txt b/deptool/CMakeLists.txt
index 679168d..cb1bca2 100644
--- a/deptool/CMakeLists.txt
+++ b/deptool/CMakeLists.txt
@@ -5,3 +5,8 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${QT_INCLUDES} )
add_executable(smokedeptool main.cpp)
target_link_libraries(smokedeptool smokebase ${QT_QTCORE_LIBRARY})
+
+if (WIN32)
+ # Realign the stack, for compatibility with an older ABI.
+ set_target_properties (smokedeptool PROPERTIES COMPILE_FLAGS -mstackrealign)
+endif (WIN32)
diff --git a/generators/dump/CMakeLists.txt b/generators/dump/CMakeLists.txt
index c3e5da6..8b41d19 100644
--- a/generators/dump/CMakeLists.txt
+++ b/generators/dump/CMakeLists.txt
@@ -7,4 +7,9 @@ add_library(generator_dump MODULE ${generator_dump_SRC})
target_link_libraries(generator_dump ${QT_QTCORE_LIBRARY} smokegen)
set_target_properties(generator_dump PROPERTIES PREFIX "")
+if (WIN32)
+ # Realign the stack, for compatibility with an older ABI.
+ set_target_properties (generator_dump PROPERTIES COMPILE_FLAGS -mstackrealign)
+endif (WIN32)
+
install(TARGETS generator_dump LIBRARY DESTINATION ${LIB_INSTALL_DIR}/smokegen)
diff --git a/generators/smoke/CMakeLists.txt b/generators/smoke/CMakeLists.txt
index cba285d..1b718c6 100644
--- a/generators/smoke/CMakeLists.txt
+++ b/generators/smoke/CMakeLists.txt
@@ -10,4 +10,9 @@ add_library(generator_smoke MODULE ${generator_smoke_SRC})
target_link_libraries(generator_smoke ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} smokegen)
set_target_properties(generator_smoke PROPERTIES PREFIX "")
+if (WIN32)
+ # Realign the stack, for compatibility with an older ABI.
+ set_target_properties (generator_smoke PROPERTIES COMPILE_FLAGS -mstackrealign)
+endif (WIN32)
+
install(TARGETS generator_smoke LIBRARY DESTINATION ${LIB_INSTALL_DIR}/smokegen/)
diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt
index 959f1f7..9c221ae 100644
--- a/parser/CMakeLists.txt
+++ b/parser/CMakeLists.txt
@@ -42,6 +42,9 @@ install(TARGETS cppparser 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 (cppparser PROPERTIES COMPILE_FLAGS -mstackrealign)
+
# Get rid of the "lib" prefix on archives/DLLs in Windows.
set_target_properties(cppparser PROPERTIES PREFIX "" IMPORT_PREFIX "")
endif (WIN32)
diff --git a/parser/rpp/CMakeLists.txt b/parser/rpp/CMakeLists.txt
index b3308f1..3724c9c 100644
--- a/parser/rpp/CMakeLists.txt
+++ b/parser/rpp/CMakeLists.txt
@@ -22,6 +22,12 @@ set(kdevcpprpp_LIB_SRCS
# to the plugin target
kde4_add_library(kdev4cpprpp SHARED ${kdevcpprpp_LIB_SRCS})
target_link_libraries(kdev4cpprpp ${KDE4_KDECORE_LIBS} ${KDEVPLATFORM_LANGUAGE_LIBRARY} ${KDE4_KTEXTEDITOR_LIBS} )
+
+if (WIN32)
+ # Realign the stack, for compatibility with an older ABI.
+ set_target_properties (kdev4cpprpp PROPERTIES COMPILE_FLAGS -mstackrealign)
+endif (WIN32)
+
install(TARGETS kdev4cpprpp ${INSTALL_TARGETS_DEFAULT_ARGS} )
########### install files ###############
diff --git a/parser/rpp/tests/CMakeLists.txt b/parser/rpp/tests/CMakeLists.txt
index cfb380b..7515e7c 100644
--- a/parser/rpp/tests/CMakeLists.txt
+++ b/parser/rpp/tests/CMakeLists.txt
@@ -11,3 +11,7 @@ set(pp_SRCS
kde4_add_executable(pp TEST ${pp_SRCS})
target_link_libraries(pp ${KDE4_KDECORE_LIBS} kdev4cpprpp)
+if (WIN32)
+ # Realign the stack, for compatibility with an older ABI.
+ set_target_properties (pp PROPERTIES COMPILE_FLAGS -mstackrealign)
+endif (WIN32)
diff --git a/parser/tests/CMakeLists.txt b/parser/tests/CMakeLists.txt
index 227fc5e..6e6aba5 100644
--- a/parser/tests/CMakeLists.txt
+++ b/parser/tests/CMakeLists.txt
@@ -11,6 +11,12 @@ set(parsertest_SRCS test_parser.cpp)
QT4_GENERATE_MOC(${parsertest_SRCS} test_parser.moc)
add_executable(parsertest ${parsertest_SRCS} test_parser.moc)
+
+if (WIN32)
+ # Realign the stack, for compatibility with an older ABI.
+ set_target_properties (parsertest PROPERTIES COMPILE_FLAGS -mstackrealign)
+endif (WIN32)
+
target_link_libraries(parsertest ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} cppparser)
########### next target ###############
@@ -19,6 +25,11 @@ set(generatortest_SRCS test_generator.cpp)
QT4_GENERATE_MOC(${generatortest_SRCS} test_generator.moc)
add_executable(generatortest ${generatortest_SRCS} test_generator.moc)
+if (WIN32)
+ # Realign the stack, for compatibility with an older ABI.
+ set_target_properties (generatortest PROPERTIES COMPILE_FLAGS -mstackrealign)
+endif (WIN32)
+
target_link_libraries(generatortest ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} cppparser)
########### next target ###############
@@ -27,4 +38,9 @@ set(pooltest_SRCS test_pool.cpp)
QT4_GENERATE_MOC(test_pool.h test_pool.moc)
add_executable(pooltest ${pooltest_SRCS} test_pool.moc)
+if (WIN32)
+ # Realign the stack, for compatibility with an older ABI.
+ set_target_properties (pooltest PROPERTIES COMPILE_FLAGS -mstackrealign)
+endif (WIN32)
+
target_link_libraries(pooltest ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} cppparser)
diff --git a/smokeapi/CMakeLists.txt b/smokeapi/CMakeLists.txt
index 3270750..398ea15 100644
--- a/smokeapi/CMakeLists.txt
+++ b/smokeapi/CMakeLists.txt
@@ -4,6 +4,12 @@ find_package(Qt4 REQUIRED)
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${QT_INCLUDES} )
add_executable(smokeapi main.cpp)
+
+if (WIN32)
+ # Realign the stack, for compatibility with an older ABI.
+ set_target_properties (smokeapi PROPERTIES COMPILE_FLAGS -mstackrealign)
+endif (WIN32)
+
target_link_libraries(smokeapi smokebase ${QT_QTCORE_LIBRARY})
install( TARGETS smokeapi
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
diff --git a/smokebase/CMakeLists.txt b/smokebase/CMakeLists.txt
index da4f004..f1643fd 100644
--- a/smokebase/CMakeLists.txt
+++ b/smokebase/CMakeLists.txt
@@ -22,6 +22,9 @@ install(TARGETS smokebase 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 (smokebase PROPERTIES COMPILE_FLAGS -mstackrealign)
+
# Get rid of the "lib" prefix on archives/DLLs in Windows.
set_target_properties(smokebase PROPERTIES PREFIX "" IMPORT_PREFIX "")
endif (WIN32)
More information about the Kde-bindings
mailing list