From 3cc7fe3245d9bab9344669a681bd31435b1d96d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= Date: Thu, 26 Jun 2014 14:18:32 +0200 Subject: [PATCH] Rename config.h to CalamaresConfig.h Avoid name clashes with partitionmanager's config.h --- src/libcalamares/CMakeLists.txt | 6 +++--- src/libcalamares/{Config.h.in => CalamaresConfig.h.in} | 6 +++--- src/libcalamares/utils/CalamaresUtils.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename src/libcalamares/{Config.h.in => CalamaresConfig.h.in} (83%) diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt index dad247f66..28531e7f3 100644 --- a/src/libcalamares/CMakeLists.txt +++ b/src/libcalamares/CMakeLists.txt @@ -5,8 +5,8 @@ add_definitions( -DQT_SHARED ) add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS ) add_definitions( -DDLLEXPORT_PRO ) -configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in - ${CMAKE_CURRENT_BINARY_DIR}/config.h ) +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CalamaresConfig.h.in + ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h ) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/../calamares/CalamaresVersion.h.in ${CMAKE_CURRENT_BINARY_DIR}/CalamaresVersion.h ) @@ -61,7 +61,7 @@ file( GLOB rootHeaders "*.h" ) file( GLOB kdsingleapplicationguardHeaders "kdsingleapplicationguard/*.h" ) file( GLOB utilsHeaders "utils/*.h" ) -install( FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h DESTINATION include/libcalamares ) +install( FILES ${CMAKE_CURRENT_BINARY_DIR}/CalamaresConfig.h DESTINATION include/libcalamares ) install( FILES ${rootHeaders} DESTINATION include/libcalamares ) install( FILES ${kdsingleapplicationguardHeaders} DESTINATION include/libcalamares/kdsingleapplicationguard ) install( FILES ${utilsHeaders} DESTINATION include/libcalamares/utils ) diff --git a/src/libcalamares/Config.h.in b/src/libcalamares/CalamaresConfig.h.in similarity index 83% rename from src/libcalamares/Config.h.in rename to src/libcalamares/CalamaresConfig.h.in index 82fdb4b20..2126124a6 100644 --- a/src/libcalamares/Config.h.in +++ b/src/libcalamares/CalamaresConfig.h.in @@ -1,5 +1,5 @@ -#ifndef CONFIG_H_IN -#define CONFIG_H_IN +#ifndef CALAMARESCONFIG_H +#define CALAMARESCONFIG_H #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" #define CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}" @@ -9,4 +9,4 @@ //cmakedefines for CMake variables (e.g. for optdepends) go here -#endif // CONFIG_H_IN +#endif // CALAMARESCONFIG_H diff --git a/src/libcalamares/utils/CalamaresUtils.cpp b/src/libcalamares/utils/CalamaresUtils.cpp index 63fb2a766..cdf903c75 100644 --- a/src/libcalamares/utils/CalamaresUtils.cpp +++ b/src/libcalamares/utils/CalamaresUtils.cpp @@ -23,7 +23,7 @@ #include "CalamaresUtils.h" -#include "config.h" +#include "CalamaresConfig.h" #include #include