Commit 26ee9e42 authored by Daniel Pfeifer's avatar Daniel Pfeifer

CPack: drop CPack prefix for includes

Automate with:

git grep -l '#include <CPack/' -- Source \
  | xargs sed -i 's/#include <CPack\/\(.*\)>/#include "\1"/g'

git grep -l '#include "CPack/' -- Source \
  | xargs sed -i 's/#include "CPack\/\(.*\)"/#include "\1"/g'
parent 5afac50f
......@@ -888,6 +888,12 @@ set(CTEST_SRCS cmCTest.cxx
add_library(CTestLib ${CTEST_SRCS})
target_link_libraries(CTestLib CMakeLib ${CMAKE_CURL_LIBRARIES} ${CMAKE_XMLRPC_LIBRARIES})
#
# CPack
#
include_directories(
"${CMake_SOURCE_DIR}/Source/CPack"
)
#
# Sources for CPack
#
......
......@@ -2,12 +2,12 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCPackIFWGenerator.h"
#include "CPack/cmCPackComponentGroup.h"
#include "CPack/cmCPackGenerator.h"
#include "CPack/cmCPackLog.h"
#include "cmCPackComponentGroup.h"
#include "cmCPackGenerator.h"
#include "cmCPackIFWInstaller.h"
#include "cmCPackIFWPackage.h"
#include "cmCPackIFWRepository.h"
#include "cmCPackLog.h"
#include "cmGeneratedFileStream.h"
#include "cmSystemTools.h"
#include "cmTimestamp.h"
......
......@@ -5,8 +5,8 @@
#include <cmConfigure.h>
#include "CPack/cmCPackComponentGroup.h"
#include "CPack/cmCPackGenerator.h"
#include "cmCPackComponentGroup.h"
#include "cmCPackGenerator.h"
#include "cmCPackIFWInstaller.h"
#include "cmCPackIFWPackage.h"
#include "cmCPackIFWRepository.h"
......
......@@ -7,11 +7,11 @@
#include <stddef.h>
#include <utility>
#include "CPack/cmCPackGenerator.h"
#include "CPack/cmCPackLog.h"
#include "cmCPackGenerator.h"
#include "cmCPackIFWGenerator.h"
#include "cmCPackIFWPackage.h"
#include "cmCPackIFWRepository.h"
#include "cmCPackLog.h"
#include "cmGeneratedFileStream.h"
#include "cmSystemTools.h"
#include "cmXMLParser.h"
......
......@@ -2,11 +2,11 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCPackIFWPackage.h"
#include "CPack/cmCPackComponentGroup.h"
#include "CPack/cmCPackGenerator.h"
#include "CPack/cmCPackLog.h"
#include "cmCPackComponentGroup.h"
#include "cmCPackGenerator.h"
#include "cmCPackIFWGenerator.h"
#include "cmCPackIFWInstaller.h"
#include "cmCPackLog.h"
#include "cmGeneratedFileStream.h"
#include "cmSystemTools.h"
#include "cmTimestamp.h"
......
......@@ -2,7 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCPackIFWRepository.h"
#include "CPack/cmCPackGenerator.h"
#include "cmCPackGenerator.h"
#include "cmCPackIFWGenerator.h"
#include "cmGeneratedFileStream.h"
#include "cmSystemTools.h"
......
......@@ -2,8 +2,8 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmCPackWIXGenerator.h"
#include <CPack/cmCPackComponentGroup.h>
#include <CPack/cmCPackLog.h>
#include "cmCPackComponentGroup.h"
#include "cmCPackLog.h"
#include <algorithm>
#include <cmCryptoHash.h>
#include <cmGeneratedFileStream.h>
......
......@@ -3,7 +3,7 @@
#ifndef cmCPackWIXGenerator_h
#define cmCPackWIXGenerator_h
#include <CPack/cmCPackGenerator.h>
#include "cmCPackGenerator.h"
#include "cmWIXPatch.h"
#include "cmWIXShortcut.h"
......
......@@ -2,7 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmWIXAccessControlList.h"
#include <CPack/cmCPackGenerator.h>
#include "cmCPackGenerator.h"
#include <cmSystemTools.h>
......
......@@ -5,7 +5,7 @@
#include "cmWIXSourceWriter.h"
#include <CPack/cmCPackLog.h>
#include "cmCPackLog.h"
#include <cmInstalledFile.h>
class cmWIXAccessControlList
......
......@@ -5,7 +5,7 @@
#include "cmWIXSourceWriter.h"
#include <CPack/cmCPackGenerator.h>
#include "cmCPackGenerator.h"
#include <string>
......
......@@ -6,7 +6,7 @@
#include "cmWIXPatch.h"
#include "cmWIXSourceWriter.h"
#include <CPack/cmCPackGenerator.h>
#include "cmCPackGenerator.h"
/** \class cmWIXFeaturesSourceWriter
* \brief Helper class to generate features.wxs
......
......@@ -8,7 +8,7 @@
#include "cmWIXPatch.h"
#include "cmWIXShortcut.h"
#include <CPack/cmCPackGenerator.h>
#include "cmCPackGenerator.h"
/** \class cmWIXFilesSourceWriter
* \brief Helper class to generate files.wxs
......
......@@ -2,7 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmWIXPatch.h"
#include <CPack/cmCPackGenerator.h>
#include "cmCPackGenerator.h"
cmWIXPatch::cmWIXPatch(cmCPackLog* logger)
: Logger(logger)
......
......@@ -2,7 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmWIXPatchParser.h"
#include <CPack/cmCPackGenerator.h>
#include "cmCPackGenerator.h"
#include <cm_expat.h>
......
......@@ -3,7 +3,7 @@
#ifndef cmCPackWIXPatchParser_h
#define cmCPackWIXPatchParser_h
#include <CPack/cmCPackLog.h>
#include "cmCPackLog.h"
#include <cmXMLParser.h>
......
......@@ -2,7 +2,7 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmWIXSourceWriter.h"
#include <CPack/cmCPackGenerator.h>
#include "cmCPackGenerator.h"
#include <cmUuid.h>
......
......@@ -3,7 +3,7 @@
#ifndef cmWIXSourceWriter_h
#define cmWIXSourceWriter_h
#include <CPack/cmCPackLog.h>
#include "cmCPackLog.h"
#include <cmsys/FStream.hxx>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment