Bläddra i källkod

BUG: Fix ctkMacroBuild{App, Lib, Plugin, QtDesignerPlugin} - Make sure variable MY_{SRCS,UI_CXX,QRC_SRCS} are cleared

Since variable are global, it was a causing some weird behavior.
Jean-Christophe Fillion-Robin 15 år sedan
förälder
incheckning
fd4845f2b9

+ 6 - 0
CMake/ctkMacroBuildApp.cmake

@@ -47,6 +47,12 @@ MACRO(ctkMacroBuildApp)
 #   SET(dynamicHeaders
 #     "${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")
 
+  # Make sure variable are cleared
+  SET(MY_SRCS)
+  SET(MY_UI_CXX)
+  SET(MY_QRC_SRCS)
+
+  # Wrap
   QT4_WRAP_CPP(MY_SRCS ${MY_MOC_SRCS})
   QT4_WRAP_UI(MY_UI_CXX ${MY_UI_FORMS})
   SET(MY_QRC_SRCS "")

+ 6 - 0
CMake/ctkMacroBuildLib.cmake

@@ -49,6 +49,12 @@ MACRO(ctkMacroBuildLib)
   SET(dynamicHeaders
     "${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")
 
+  # Make sure variable are cleared
+  SET(MY_SRCS)
+  SET(MY_UI_CXX)
+  SET(MY_QRC_SRCS)
+
+  # Wrap
   QT4_WRAP_CPP(MY_SRCS ${MY_MOC_SRCS})
   QT4_WRAP_UI(MY_UI_CXX ${MY_UI_FORMS})
   SET(MY_QRC_SRCS "")

+ 6 - 0
CMake/ctkMacroBuildPlugin.cmake

@@ -48,6 +48,12 @@ MACRO(ctkMacroBuildPlugin)
   SET(dynamicHeaders
     "${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")
 
+  # Make sure variable are cleared
+  SET(MY_SRCS)
+  SET(MY_UI_CXX)
+  SET(MY_QRC_SRCS)
+
+  # Wrap
   QT4_WRAP_CPP(MY_SRCS ${MY_MOC_SRCS})
   QT4_WRAP_UI(MY_UI_CXX ${MY_UI_FORMS})
   SET(MY_QRC_SRCS "")

+ 6 - 0
CMake/ctkMacroBuildQtDesignerPlugin.cmake

@@ -49,6 +49,12 @@ MACRO(ctkMacroBuildQtDesignerPlugin)
   SET(dynamicHeaders
     "${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")
 
+  # Make sure variable are cleared
+  SET(MY_SRCS)
+  SET(MY_UI_CXX)
+  SET(MY_QRC_SRCS)
+
+  # Wrap
   QT4_WRAP_CPP(MY_SRCS ${MY_MOC_SRCS})
   QT4_WRAP_UI(MY_UI_CXX ${MY_UI_FORMS})
   SET(MY_QRC_SRCS "")