Add underscore to internal implementation detail variables.
authorStephen Kelly <stephen.kelly@kdab.com>
Thu, 10 May 2012 12:39:26 +0000 (14:39 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 10 May 2012 20:46:55 +0000 (22:46 +0200)
Change-Id: I4c70ed2808396931fff986fbfad5940dd39e74f6
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
mkspecs/cmake/Qt5BasicConfig.cmake.in

index d65beb3..f3c7206 100644 (file)
@@ -51,7 +51,7 @@ if (Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
   list(REMOVE_DUPLICATES Qt5$${CMAKE_MODULE_NAME}_EXECUTABLE_COMPILE_FLAGS)
 endif()
 
-set(Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_QT5_MODULE_DEPS}\")
+set(_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_QT5_MODULE_DEPS}\")
 
 !!IF !isEmpty(CMAKE_STATIC_TYPE)
 # For static builds, we also list the dependencies of
@@ -59,10 +59,10 @@ set(Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_QT5_MODULE_DEPS}\")
 
 !!IF isEqual(CMAKE_MODULE_NAME, Core)
 
-set(Qt5Core_LIB_DEPENDENCIES)
+set(_Qt5Core_LIB_DEPENDENCIES)
 !!IF contains(QT_CONFIG, system-zlib)
 find_package(ZLIB REQUIRED)
-list(APPEND Qt5Core_LIB_DEPENDENCIES ${ZLIB_LIBRARIES})
+list(APPEND _Qt5Core_LIB_DEPENDENCIES ${ZLIB_LIBRARIES})
 !!ENDIF
 
 !!IF contains(QT_CONFIG, glib)
@@ -70,35 +70,35 @@ find_library(QT_GLIB_LIBRARY NAMES glib-2.0 )
 find_library(QT_GTHREAD_LIBRARY NAMES gthread-2.0 )
 mark_as_advanced(QT_GLIB_LIBRARY)
 mark_as_advanced(QT_GTHREAD_LIBRARY)
-list(APPEND Qt5Core_LIB_DEPENDENCIES ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
+list(APPEND _Qt5Core_LIB_DEPENDENCIES ${QT_GTHREAD_LIBRARY} ${QT_GLIB_LIBRARY})
 !!ENDIF
 
 !!IF contains(QT_CONFIG, clock-monotonic)
 find_library(QT_RT_LIBRARY NAMES rt)
 mark_as_advanced(QT_RT_LIBRARY)
-list(APPEND Qt5Core_LIB_DEPENDENCIES ${QT_RT_LIBRARY})
+list(APPEND _Qt5Core_LIB_DEPENDENCIES ${QT_RT_LIBRARY})
 !!ENDIF
 
 set(CMAKE_THREAD_PREFER_PTHREADS 1)
 find_package(Threads)
 if(CMAKE_USE_PTHREADS_INIT)
-  list(APPEND Qt5Core_LIB_DEPENDENCIES ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
+  list(APPEND _Qt5Core_LIB_DEPENDENCIES ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
 endif()
 
 !!ENDIF # Core
 
 !!IF isEqual(CMAKE_MODULE_NAME, Gui)
 
-set(Qt5Gui_LIB_DEPENDENCIES)
+set(_Qt5Gui_LIB_DEPENDENCIES)
 
 !!IF contains(QT_CONFIG, system-png)
 find_package(PNG REQUIRED)
-list(APPEND Qt5Gui_LIB_DEPENDENCIES ${PNG_LIBRARIES})
+list(APPEND _Qt5Gui_LIB_DEPENDENCIES ${PNG_LIBRARIES})
 !!ENDIF
 
 !!IF contains(QT_CONFIG, system-jpeg)
 find_package(JPEG REQUIRED)
-list(APPEND Qt5Gui_LIB_DEPENDENCIES ${JPEG_LIBRARIES})
+list(APPEND _Qt5Gui_LIB_DEPENDENCIES ${JPEG_LIBRARIES})
 !!ENDIF
 
 !!ENDIF # Gui
@@ -120,7 +120,7 @@ endif()
 !!IF !isEmpty(CMAKE_DEBUG_TYPE)
 set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
 set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
-    IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG \"${Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
+    IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
     IMPORTED_LOCATION_DEBUG \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\"
 !!ELSE
@@ -137,7 +137,7 @@ set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 !!IF !isEmpty(CMAKE_RELEASE_TYPE)
 set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
 set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
-    IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE \"${Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
+    IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
     IMPORTED_LOCATION_RELEASE \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
 !!ELSE