From a97d7bbdaed5d25e1a6d2937e4a8ea88bae90246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 29 Jun 2014 10:32:01 +0200 Subject: [PATCH] Text: renamed configure.h.cmake to fontconverterConfigure.h.cmake. Reason is that the configure file is not for whole Text library, but only for the magnum-fontconverter utility. Rename it so it is more clear. --- src/Magnum/Text/CMakeLists.txt | 6 +++--- src/Magnum/Text/fontconverter.cpp | 2 +- .../{configure.h.cmake => fontconverterConfigure.h.cmake} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename src/Magnum/Text/{configure.h.cmake => fontconverterConfigure.h.cmake} (100%) diff --git a/src/Magnum/Text/CMakeLists.txt b/src/Magnum/Text/CMakeLists.txt index 50e59a4a8..5513a8d5d 100644 --- a/src/Magnum/Text/CMakeLists.txt +++ b/src/Magnum/Text/CMakeLists.txt @@ -60,10 +60,10 @@ install(TARGETS MagnumText install(FILES ${MagnumText_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Text) if(WITH_FONTCONVERTER) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/fontconverterConfigure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/fontconverterConfigure.h) - include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) + include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_executable(magnum-fontconverter fontconverter.cpp) diff --git a/src/Magnum/Text/fontconverter.cpp b/src/Magnum/Text/fontconverter.cpp index 690c87784..6e69bf9cb 100644 --- a/src/Magnum/Text/fontconverter.cpp +++ b/src/Magnum/Text/fontconverter.cpp @@ -42,7 +42,7 @@ #error No windowless application available on this platform #endif -#include "configure.h" +#include "fontconverterConfigure.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/configure.h.cmake b/src/Magnum/Text/fontconverterConfigure.h.cmake similarity index 100% rename from src/Magnum/Text/configure.h.cmake rename to src/Magnum/Text/fontconverterConfigure.h.cmake