Rename CMake variables *_CXX into *_CPP in app, lib and plugin build macros

CMake/ctkMacroBuildApp.cmake

@@ -99,13 +99,13 @@ MACRO(ctkMacroBuildApp)
 #     "${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")
 
   # Make sure variable are cleared
-  SET(MY_UI_CXX)
-  SET(MY_MOC_CXX)
+  SET(MY_UI_CPP)
+  SET(MY_MOC_CPP)
   SET(MY_QRC_SRCS)
 
   # Wrap
-  QT4_WRAP_CPP(MY_MOC_CXX ${MY_MOC_SRCS})
-  QT4_WRAP_UI(MY_UI_CXX ${MY_UI_FORMS})
+  QT4_WRAP_CPP(MY_MOC_CPP ${MY_MOC_SRCS})
+  QT4_WRAP_UI(MY_UI_CPP ${MY_UI_FORMS})
   IF(DEFINED MY_RESOURCES)
     QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_RESOURCES})
   ENDIF()
@@ -117,21 +117,21 @@ MACRO(ctkMacroBuildApp)
 
   SOURCE_GROUP("Generated" FILES
     ${MY_QRC_SRCS}
-    ${MY_MOC_CXX}
-    ${MY_UI_CXX}
+    ${MY_MOC_CPP}
+    ${MY_UI_CPP}
     )
 
   # Create executable
   ADD_EXECUTABLE(${proj_name}
     ${MY_SRCS}
-    ${MY_MOC_CXX}
-    ${MY_UI_CXX}
+    ${MY_MOC_CPP}
+    ${MY_UI_CPP}
     ${MY_QRC_SRCS}
     )
 #   ADD_LIBRARY(${lib_name} ${MY_LIBRARY_TYPE}
 #     ${MY_SRCS}
-#     ${MY_MOC_CXX}
-#     ${MY_UI_CXX}
+#     ${MY_MOC_CPP}
+#     ${MY_UI_CPP}
 #     ${MY_QRC_SRCS}
 #     )
 

CMake/ctkMacroBuildLib.cmake

@@ -98,13 +98,13 @@ MACRO(ctkMacroBuildLib)
     "${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")
 
   # Make sure variable are cleared
-  SET(MY_MOC_CXX)
-  SET(MY_UI_CXX)
+  SET(MY_MOC_CPP)
+  SET(MY_UI_CPP)
   SET(MY_QRC_SRCS)
 
   # Wrap
-  QT4_WRAP_CPP(MY_MOC_CXX ${MY_MOC_SRCS})
-  QT4_WRAP_UI(MY_UI_CXX ${MY_UI_FORMS})
+  QT4_WRAP_CPP(MY_MOC_CPP ${MY_MOC_SRCS})
+  QT4_WRAP_UI(MY_UI_CPP ${MY_UI_FORMS})
   IF(DEFINED MY_RESOURCES)
     QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_RESOURCES})
   ENDIF()
@@ -116,14 +116,14 @@ MACRO(ctkMacroBuildLib)
 
   SOURCE_GROUP("Generated" FILES
     ${MY_QRC_SRCS}
-    ${MY_MOC_CXX}
-    ${MY_UI_CXX}
+    ${MY_MOC_CPP}
+    ${MY_UI_CPP}
     )
   
   ADD_LIBRARY(${lib_name} ${MY_LIBRARY_TYPE}
     ${MY_SRCS}
-    ${MY_MOC_CXX}
-    ${MY_UI_CXX}
+    ${MY_MOC_CPP}
+    ${MY_UI_CPP}
     ${MY_QRC_SRCS}
     )
 

CMake/ctkMacroBuildPlugin.cmake

@@ -133,13 +133,13 @@ MACRO(ctkMacroBuildPlugin)
     "${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")
 
   # Make sure variable are cleared
-  SET(MY_MOC_CXX)
-  SET(MY_UI_CXX)
+  SET(MY_MOC_CPP)
+  SET(MY_UI_CPP)
   SET(MY_QRC_SRCS)
 
   # Wrap
-  QT4_WRAP_CPP(MY_MOC_CXX ${MY_MOC_SRCS})
-  QT4_WRAP_UI(MY_UI_CXX ${MY_UI_FORMS})
+  QT4_WRAP_CPP(MY_MOC_CPP ${MY_MOC_SRCS})
+  QT4_WRAP_UI(MY_UI_CPP ${MY_UI_FORMS})
   IF(DEFINED MY_RESOURCES)
     QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_RESOURCES})
   ENDIF()
@@ -184,14 +184,14 @@ MACRO(ctkMacroBuildPlugin)
 
   SOURCE_GROUP("Generated" FILES
     ${MY_QRC_SRCS}
-    ${MY_MOC_CXX}
-    ${MY_UI_CXX}
+    ${MY_MOC_CPP}
+    ${MY_UI_CPP}
     )
   
   ADD_LIBRARY(${lib_name} ${MY_LIBRARY_TYPE}
     ${MY_SRCS}
-    ${MY_MOC_CXX}
-    ${MY_UI_CXX}
+    ${MY_MOC_CPP}
+    ${MY_UI_CPP}
     ${MY_QRC_SRCS}
     )
 

CMake/ctkMacroBuildQtDesignerPlugin.cmake

@@ -70,12 +70,12 @@ MACRO(ctkMacroBuildQtDesignerPlugin)
     "${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/${MY_EXPORT_HEADER_PREFIX}Export.h")
 
   # Make sure variable are cleared
-  SET(MY_UI_CXX)
+  SET(MY_UI_CPP)
   SET(MY_QRC_SRCS)
 
   # Wrap
   QT4_WRAP_CPP(MY_SRCS ${MY_MOC_SRCS})
-  QT4_WRAP_UI(MY_UI_CXX ${MY_UI_FORMS})
+  QT4_WRAP_UI(MY_UI_CPP ${MY_UI_FORMS})
   SET(MY_QRC_SRCS "")
   IF(DEFINED MY_RESOURCES)
     QT4_ADD_RESOURCES(MY_QRC_SRCS ${MY_RESOURCES})
@@ -89,12 +89,12 @@ MACRO(ctkMacroBuildQtDesignerPlugin)
   SOURCE_GROUP("Generated" FILES
     ${MY_MOC_SRCS}
     ${MY_QRC_SRCS}
-    ${MY_UI_CXX}
+    ${MY_UI_CPP}
     )
   
   ADD_LIBRARY(${lib_name} ${MY_LIBRARY_TYPE}
     ${MY_SRCS}
-    ${MY_UI_CXX}
+    ${MY_UI_CPP}
     ${MY_QRC_SRCS}
     )