Browse Source

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.
pull/55/merge
Vladimír Vondruš 12 years ago
parent
commit
a97d7bbdae
  1. 6
      src/Magnum/Text/CMakeLists.txt
  2. 2
      src/Magnum/Text/fontconverter.cpp
  3. 0
      src/Magnum/Text/fontconverterConfigure.h.cmake

6
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)

2
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 {

0
src/Magnum/Text/configure.h.cmake → src/Magnum/Text/fontconverterConfigure.h.cmake

Loading…
Cancel
Save