From 7a683621703df55496241050dd406f00f538342c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 10 Jan 2014 19:34:49 +0100 Subject: [PATCH] Making includes absolute, part 6: better filenames for internal files. As we are now using absolute includes, there is no need to prefix everything with "magnum" etc. All generated configuration files are renamed to configure.h and their path is included _before_ everything else to avoid accidental collisions. --- modules/FindMagnum.cmake | 2 +- src/Magnum/AbstractImage.h | 2 +- src/Magnum/AbstractObject.h | 2 +- src/Magnum/AbstractShaderProgram.h | 1 - src/Magnum/Audio/Buffer.h | 2 +- src/Magnum/Audio/CMakeLists.txt | 2 +- src/Magnum/Audio/Context.h | 2 +- src/Magnum/Audio/Renderer.h | 2 +- src/Magnum/Audio/Source.h | 2 +- src/Magnum/Audio/Test/AbstractImporterTest.cpp | 2 +- src/Magnum/Audio/Test/CMakeLists.txt | 6 +++--- .../Test/{testConfigure.h.cmake => configure.h.cmake} | 0 .../Audio/{magnumAudioVisibility.h => visibility.h} | 6 +++--- src/Magnum/CMakeLists.txt | 8 ++++---- src/Magnum/ColorFormat.h | 2 +- src/Magnum/Context.h | 2 +- src/Magnum/DebugMessage.h | 2 +- src/Magnum/DebugTools/CMakeLists.txt | 2 +- src/Magnum/DebugTools/ForceRenderer.h | 2 +- src/Magnum/DebugTools/ObjectRenderer.h | 2 +- src/Magnum/DebugTools/Profiler.h | 2 +- src/Magnum/DebugTools/ResourceManager.h | 2 +- src/Magnum/DebugTools/ShapeRenderer.h | 2 +- .../{magnumDebugToolsVisibility.h => visibility.h} | 6 +++--- src/Magnum/Implementation/ShaderState.h | 2 +- src/Magnum/Magnum.h | 1 - src/Magnum/Math/Angle.h | 2 +- src/Magnum/Math/Functions.h | 2 +- src/Magnum/Math/Vector.h | 2 +- src/Magnum/MeshTools/CMakeLists.txt | 2 +- src/Magnum/MeshTools/CompressIndices.h | 2 +- src/Magnum/MeshTools/FlipNormals.h | 2 +- src/Magnum/MeshTools/FullScreenTriangle.h | 2 +- src/Magnum/MeshTools/GenerateFlatNormals.h | 2 +- src/Magnum/MeshTools/Tipsify.h | 2 +- .../{magnumMeshToolsVisibility.h => visibility.h} | 6 +++--- src/Magnum/MeshView.h | 2 +- src/Magnum/OpenGL.h | 2 +- src/Magnum/Primitives/CMakeLists.txt | 2 +- src/Magnum/Primitives/Capsule.h | 2 +- src/Magnum/Primitives/Circle.h | 2 +- src/Magnum/Primitives/Crosshair.h | 2 +- src/Magnum/Primitives/Cube.h | 2 +- src/Magnum/Primitives/Cylinder.h | 2 +- src/Magnum/Primitives/Icosphere.h | 2 +- src/Magnum/Primitives/Line.h | 2 +- src/Magnum/Primitives/Plane.h | 2 +- src/Magnum/Primitives/Square.h | 2 +- src/Magnum/Primitives/UVSphere.h | 2 +- .../{magnumPrimitivesVisibility.h => visibility.h} | 6 +++--- src/Magnum/Query.h | 2 +- src/Magnum/Renderbuffer.h | 1 - src/Magnum/Renderer.h | 2 +- src/Magnum/Resource.h | 2 +- src/Magnum/Sampler.h | 2 +- src/Magnum/SceneGraph/AbstractCamera.h | 2 +- src/Magnum/SceneGraph/AbstractObject.h | 2 +- src/Magnum/SceneGraph/AbstractTransformation.h | 2 +- src/Magnum/SceneGraph/Animable.h | 2 +- src/Magnum/SceneGraph/AnimableGroup.h | 2 +- src/Magnum/SceneGraph/CMakeLists.txt | 2 +- src/Magnum/SceneGraph/FeatureGroup.h | 2 +- src/Magnum/SceneGraph/Object.h | 2 +- .../{magnumSceneGraphVisibility.h => visibility.h} | 6 +++--- src/Magnum/Shader.h | 1 - src/Magnum/Shaders/CMakeLists.txt | 2 +- src/Magnum/Shaders/DistanceFieldVector.h | 2 +- src/Magnum/Shaders/Flat.h | 2 +- src/Magnum/Shaders/MeshVisualizer.h | 2 +- src/Magnum/Shaders/Phong.h | 2 +- src/Magnum/Shaders/Vector.h | 2 +- src/Magnum/Shaders/VertexColor.h | 2 +- src/Magnum/Shaders/magnumShadersResourceImport.hpp | 2 +- .../Shaders/{magnumShadersVisibility.h => visibility.h} | 2 +- src/Magnum/Shapes/AbstractShape.h | 4 ++-- src/Magnum/Shapes/AxisAlignedBox.h | 2 +- src/Magnum/Shapes/Box.h | 2 +- src/Magnum/Shapes/CMakeLists.txt | 4 ++-- src/Magnum/Shapes/Capsule.h | 2 +- src/Magnum/Shapes/Composition.h | 2 +- src/Magnum/Shapes/Cylinder.h | 2 +- src/Magnum/Shapes/Line.h | 2 +- src/Magnum/Shapes/Plane.h | 2 +- src/Magnum/Shapes/Point.h | 2 +- src/Magnum/Shapes/Shape.h | 2 +- src/Magnum/Shapes/ShapeGroup.h | 2 +- src/Magnum/Shapes/Sphere.h | 2 +- src/Magnum/Shapes/shapeImplementation.h | 2 +- .../Shapes/{magnumShapesVisibility.h => visibility.h} | 6 +++--- src/Magnum/Test/CMakeLists.txt | 6 +++--- src/Magnum/Test/ShaderGLTest.cpp | 2 +- .../{ShaderGLTestConfigure.h.cmake => configure.h.cmake} | 0 src/Magnum/Text/AbstractFont.h | 2 +- src/Magnum/Text/AbstractFontConverter.h | 2 +- src/Magnum/Text/CMakeLists.txt | 4 ++-- src/Magnum/Text/GlyphCache.h | 2 +- src/Magnum/Text/Renderer.h | 2 +- src/Magnum/Text/Test/AbstractFontConverterTest.cpp | 2 +- src/Magnum/Text/Test/AbstractFontTest.cpp | 2 +- src/Magnum/Text/Test/CMakeLists.txt | 6 +++--- .../Test/{testConfigure.h.cmake => configure.h.cmake} | 0 src/Magnum/Text/Text.h | 2 +- src/Magnum/Text/{magnumTextVisibility.h => visibility.h} | 6 +++--- src/Magnum/TextureTools/CMakeLists.txt | 4 ++-- src/Magnum/TextureTools/distancefieldconverter.cpp | 2 +- ...re.h.cmake => distancefieldconverterConfigure.h.cmake} | 0 src/Magnum/TextureTools/magnumTextureToolsVisibility.h | 2 +- src/Magnum/Timeline.h | 2 +- src/Magnum/Trade/AbstractImageConverter.h | 2 +- src/Magnum/Trade/AbstractImporter.h | 2 +- src/Magnum/Trade/AbstractMaterialData.h | 2 +- src/Magnum/Trade/MeshData2D.h | 2 +- src/Magnum/Trade/MeshData3D.h | 2 +- src/Magnum/Trade/SceneData.h | 2 +- src/Magnum/Trade/Test/AbstractImageConverterTest.cpp | 2 +- src/Magnum/Trade/Test/AbstractImporterTest.cpp | 2 +- src/Magnum/Trade/Test/CMakeLists.txt | 6 +++--- .../Test/{testConfigure.h.cmake => configure.h.cmake} | 0 src/Magnum/Trade/TextureData.h | 2 +- src/Magnum/Types.h | 2 +- src/Magnum/Version.h | 2 +- src/Magnum/{magnumConfigure.h.cmake => configure.h.cmake} | 0 src/Magnum/{magnumVisibility.h => visibility.h} | 6 +++--- src/MagnumPlugins/MagnumFont/CMakeLists.txt | 2 +- src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt | 6 +++--- src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp | 2 +- ...{magnumFontTestConfigure.h.cmake => configure.h.cmake} | 0 ...nRegistrationMagnumFont.cpp => pluginRegistration.cpp} | 0 src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt | 2 +- src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt | 7 +++---- .../Test/MagnumFontConverterGLTest.cpp | 4 ++-- ...ntConverterTestConfigure.h.cmake => configure.h.cmake} | 0 ...tionMagnumFontConverter.cpp => pluginRegistration.cpp} | 0 src/MagnumPlugins/TgaImageConverter/CMakeLists.txt | 2 +- src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt | 2 +- ...rationTgaImageConverter.cpp => pluginRegistration.cpp} | 0 src/MagnumPlugins/TgaImporter/CMakeLists.txt | 2 +- src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt | 2 +- ...RegistrationTgaImporter.cpp => pluginRegistration.cpp} | 0 src/MagnumPlugins/WavAudioImporter/CMakeLists.txt | 2 +- src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt | 2 +- ...trationWavAudioImporter.cpp => pluginRegistration.cpp} | 0 142 files changed, 161 insertions(+), 166 deletions(-) rename src/Magnum/Audio/Test/{testConfigure.h.cmake => configure.h.cmake} (100%) rename src/Magnum/Audio/{magnumAudioVisibility.h => visibility.h} (92%) rename src/Magnum/DebugTools/{magnumDebugToolsVisibility.h => visibility.h} (91%) rename src/Magnum/MeshTools/{magnumMeshToolsVisibility.h => visibility.h} (91%) rename src/Magnum/Primitives/{magnumPrimitivesVisibility.h => visibility.h} (91%) rename src/Magnum/SceneGraph/{magnumSceneGraphVisibility.h => visibility.h} (91%) rename src/Magnum/Shaders/{magnumShadersVisibility.h => visibility.h} (97%) rename src/Magnum/Shapes/{magnumShapesVisibility.h => visibility.h} (92%) rename src/Magnum/Test/{ShaderGLTestConfigure.h.cmake => configure.h.cmake} (100%) rename src/Magnum/Text/Test/{testConfigure.h.cmake => configure.h.cmake} (100%) rename src/Magnum/Text/{magnumTextVisibility.h => visibility.h} (92%) rename src/Magnum/TextureTools/{configure.h.cmake => distancefieldconverterConfigure.h.cmake} (100%) rename src/Magnum/Trade/Test/{testConfigure.h.cmake => configure.h.cmake} (100%) rename src/Magnum/{magnumConfigure.h.cmake => configure.h.cmake} (100%) rename src/Magnum/{magnumVisibility.h => visibility.h} (93%) rename src/MagnumPlugins/MagnumFont/Test/{magnumFontTestConfigure.h.cmake => configure.h.cmake} (100%) rename src/MagnumPlugins/MagnumFont/{pluginRegistrationMagnumFont.cpp => pluginRegistration.cpp} (100%) rename src/MagnumPlugins/MagnumFontConverter/Test/{magnumFontConverterTestConfigure.h.cmake => configure.h.cmake} (100%) rename src/MagnumPlugins/MagnumFontConverter/{pluginRegistrationMagnumFontConverter.cpp => pluginRegistration.cpp} (100%) rename src/MagnumPlugins/TgaImageConverter/{pluginRegistrationTgaImageConverter.cpp => pluginRegistration.cpp} (100%) rename src/MagnumPlugins/TgaImporter/{pluginRegistrationTgaImporter.cpp => pluginRegistration.cpp} (100%) rename src/MagnumPlugins/WavAudioImporter/{pluginRegistrationWavAudioImporter.cpp => pluginRegistration.cpp} (100%) diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake index 63e62714c..a2cd65275 100644 --- a/modules/FindMagnum.cmake +++ b/modules/FindMagnum.cmake @@ -133,7 +133,7 @@ find_path(MAGNUM_INCLUDE_DIR NAMES Magnum/Magnum.h) # Configuration -file(READ ${MAGNUM_INCLUDE_DIR}/Magnum/magnumConfigure.h _magnumConfigure) +file(READ ${MAGNUM_INCLUDE_DIR}/Magnum/configure.h _magnumConfigure) string(FIND "${_magnumConfigure}" "#define MAGNUM_BUILD_DEPRECATED" _BUILD_DEPRECATED) if(NOT _BUILD_DEPRECATED EQUAL -1) diff --git a/src/Magnum/AbstractImage.h b/src/Magnum/AbstractImage.h index a651755dc..a905073c4 100644 --- a/src/Magnum/AbstractImage.h +++ b/src/Magnum/AbstractImage.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/AbstractObject.h b/src/Magnum/AbstractObject.h index a3a192c83..0011b1a25 100644 --- a/src/Magnum/AbstractObject.h +++ b/src/Magnum/AbstractObject.h @@ -32,7 +32,7 @@ #include "Magnum/OpenGL.h" #include "Magnum/Types.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/AbstractShaderProgram.h b/src/Magnum/AbstractShaderProgram.h index 713d3bd46..8b89c42ef 100644 --- a/src/Magnum/AbstractShaderProgram.h +++ b/src/Magnum/AbstractShaderProgram.h @@ -33,7 +33,6 @@ #include "Magnum/AbstractObject.h" #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/Audio/Buffer.h b/src/Magnum/Audio/Buffer.h index 52a6d9b24..3f2d44bc5 100644 --- a/src/Magnum/Audio/Buffer.h +++ b/src/Magnum/Audio/Buffer.h @@ -33,7 +33,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/Audio/magnumAudioVisibility.h" +#include "Magnum/Audio/visibility.h" namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/CMakeLists.txt b/src/Magnum/Audio/CMakeLists.txt index 3f1a20870..ce213f309 100644 --- a/src/Magnum/Audio/CMakeLists.txt +++ b/src/Magnum/Audio/CMakeLists.txt @@ -42,7 +42,7 @@ set(MagnumAudio_HEADERS Renderer.h Source.h - magnumAudioVisibility.h) + visibility.h) add_library(MagnumAudio ${SHARED_OR_STATIC} ${MagnumAudio_SOURCES}) target_link_libraries(MagnumAudio ${CORRADE_PLUGINMANAGER_LIBRARIES} ${OPENAL_LIBRARY}) diff --git a/src/Magnum/Audio/Context.h b/src/Magnum/Audio/Context.h index ae7459e6f..c129d43bc 100644 --- a/src/Magnum/Audio/Context.h +++ b/src/Magnum/Audio/Context.h @@ -31,7 +31,7 @@ #include #include -#include "Magnum/Audio/magnumAudioVisibility.h" +#include "Magnum/Audio/visibility.h" #ifndef DOXYGEN_GENERATING_OUTPUT typedef struct ALCdevice_struct ALCdevice; diff --git a/src/Magnum/Audio/Renderer.h b/src/Magnum/Audio/Renderer.h index 338a30324..a2171b8e6 100644 --- a/src/Magnum/Audio/Renderer.h +++ b/src/Magnum/Audio/Renderer.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/Audio/magnumAudioVisibility.h" +#include "Magnum/Audio/visibility.h" #include "Magnum/Math/Vector3.h" namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/Source.h b/src/Magnum/Audio/Source.h index 8de8a619c..f0e2a1aae 100644 --- a/src/Magnum/Audio/Source.h +++ b/src/Magnum/Audio/Source.h @@ -34,7 +34,7 @@ #include "Magnum/Magnum.h" #include "Magnum/Audio/Audio.h" -#include "Magnum/Audio/magnumAudioVisibility.h" +#include "Magnum/Audio/visibility.h" #include "Magnum/Math/Vector3.h" namespace Magnum { namespace Audio { diff --git a/src/Magnum/Audio/Test/AbstractImporterTest.cpp b/src/Magnum/Audio/Test/AbstractImporterTest.cpp index 908ffff7a..feca5915e 100644 --- a/src/Magnum/Audio/Test/AbstractImporterTest.cpp +++ b/src/Magnum/Audio/Test/AbstractImporterTest.cpp @@ -28,7 +28,7 @@ #include "Magnum/Audio/AbstractImporter.h" -#include "testConfigure.h" +#include "configure.h" namespace Magnum { namespace Audio { namespace Test { diff --git a/src/Magnum/Audio/Test/CMakeLists.txt b/src/Magnum/Audio/Test/CMakeLists.txt index 3a42d1f27..132ece4fa 100644 --- a/src/Magnum/Audio/Test/CMakeLists.txt +++ b/src/Magnum/Audio/Test/CMakeLists.txt @@ -22,10 +22,10 @@ # DEALINGS IN THE SOFTWARE. # -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testConfigure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/testConfigure.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(AudioAbstractImporterTest AbstractImporterTest.cpp LIBRARIES MagnumAudio) corrade_add_test(AudioBufferTest BufferTest.cpp LIBRARIES MagnumAudio) diff --git a/src/Magnum/Audio/Test/testConfigure.h.cmake b/src/Magnum/Audio/Test/configure.h.cmake similarity index 100% rename from src/Magnum/Audio/Test/testConfigure.h.cmake rename to src/Magnum/Audio/Test/configure.h.cmake diff --git a/src/Magnum/Audio/magnumAudioVisibility.h b/src/Magnum/Audio/visibility.h similarity index 92% rename from src/Magnum/Audio/magnumAudioVisibility.h rename to src/Magnum/Audio/visibility.h index 39d974f6d..9e20065a0 100644 --- a/src/Magnum/Audio/magnumAudioVisibility.h +++ b/src/Magnum/Audio/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Audio_magnumAudioVisibility_h -#define Magnum_Audio_magnumAudioVisibility_h +#ifndef Magnum_Audio_visibility_h +#define Magnum_Audio_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumAudio_EXPORTS diff --git a/src/Magnum/CMakeLists.txt b/src/Magnum/CMakeLists.txt index fdb6d5d5d..96d789364 100644 --- a/src/Magnum/CMakeLists.txt +++ b/src/Magnum/CMakeLists.txt @@ -22,8 +22,8 @@ # DEALINGS IN THE SOFTWARE. # -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/magnumConfigure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/magnumConfigure.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h) # Files shared between main library and unit test library set(Magnum_SRCS @@ -119,7 +119,7 @@ set(Magnum_HEADERS Types.h Version.h - magnumVisibility.h) + visibility.h) # Deprecated headers if(BUILD_DEPRECATED) @@ -182,7 +182,7 @@ install(TARGETS Magnum LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR} ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}) install(FILES ${Magnum_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/magnumConfigure.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/configure.h DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}) add_subdirectory(Math) add_subdirectory(Platform) diff --git a/src/Magnum/ColorFormat.h b/src/Magnum/ColorFormat.h index 4b3b68305..a25a1d79a 100644 --- a/src/Magnum/ColorFormat.h +++ b/src/Magnum/ColorFormat.h @@ -30,7 +30,7 @@ #include "Magnum/Magnum.h" #include "Magnum/OpenGL.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/Context.h b/src/Magnum/Context.h index fa1c6e13e..efe95f141 100644 --- a/src/Magnum/Context.h +++ b/src/Magnum/Context.h @@ -35,7 +35,7 @@ #include "Magnum/Magnum.h" #include "Magnum/OpenGL.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/DebugMessage.h b/src/Magnum/DebugMessage.h index 320ac633a..f87de89c7 100644 --- a/src/Magnum/DebugMessage.h +++ b/src/Magnum/DebugMessage.h @@ -32,7 +32,7 @@ #include "Magnum/Magnum.h" #include "Magnum/OpenGL.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/DebugTools/CMakeLists.txt b/src/Magnum/DebugTools/CMakeLists.txt index 987e07a5e..5c1743b57 100644 --- a/src/Magnum/DebugTools/CMakeLists.txt +++ b/src/Magnum/DebugTools/CMakeLists.txt @@ -47,7 +47,7 @@ set(MagnumDebugTools_HEADERS ResourceManager.h ShapeRenderer.h - magnumDebugToolsVisibility.h) + visibility.h) add_library(MagnumDebugTools ${SHARED_OR_STATIC} ${MagnumDebugTools_SRCS}) if(BUILD_STATIC_PIC) diff --git a/src/Magnum/DebugTools/ForceRenderer.h b/src/Magnum/DebugTools/ForceRenderer.h index 81acf7264..6d2f00aba 100644 --- a/src/Magnum/DebugTools/ForceRenderer.h +++ b/src/Magnum/DebugTools/ForceRenderer.h @@ -32,7 +32,7 @@ #include "Magnum/Resource.h" #include "Magnum/SceneGraph/Drawable.h" #include "Magnum/Shaders/Shaders.h" -#include "Magnum/DebugTools/magnumDebugToolsVisibility.h" +#include "Magnum/DebugTools/visibility.h" namespace Magnum { namespace DebugTools { diff --git a/src/Magnum/DebugTools/ObjectRenderer.h b/src/Magnum/DebugTools/ObjectRenderer.h index 8d1f48144..cd049e441 100644 --- a/src/Magnum/DebugTools/ObjectRenderer.h +++ b/src/Magnum/DebugTools/ObjectRenderer.h @@ -31,7 +31,7 @@ #include "Magnum/Resource.h" #include "Magnum/SceneGraph/Drawable.h" #include "Magnum/Shaders/Shaders.h" -#include "Magnum/DebugTools/magnumDebugToolsVisibility.h" +#include "Magnum/DebugTools/visibility.h" namespace Magnum { namespace DebugTools { diff --git a/src/Magnum/DebugTools/Profiler.h b/src/Magnum/DebugTools/Profiler.h index c0d7b1d3a..2ff81cde5 100644 --- a/src/Magnum/DebugTools/Profiler.h +++ b/src/Magnum/DebugTools/Profiler.h @@ -34,7 +34,7 @@ #include #include "Magnum/Types.h" -#include "Magnum/DebugTools/magnumDebugToolsVisibility.h" +#include "Magnum/DebugTools/visibility.h" namespace Magnum { namespace DebugTools { diff --git a/src/Magnum/DebugTools/ResourceManager.h b/src/Magnum/DebugTools/ResourceManager.h index 00c7da58b..3930e3051 100644 --- a/src/Magnum/DebugTools/ResourceManager.h +++ b/src/Magnum/DebugTools/ResourceManager.h @@ -35,7 +35,7 @@ #include "Magnum/Magnum.h" #include "Magnum/DebugTools/DebugTools.h" -#include "Magnum/DebugTools/magnumDebugToolsVisibility.h" +#include "Magnum/DebugTools/visibility.h" #include "Magnum/SceneGraph/SceneGraph.h" #include "Magnum/Shapes/Shapes.h" diff --git a/src/Magnum/DebugTools/ShapeRenderer.h b/src/Magnum/DebugTools/ShapeRenderer.h index 0982d235c..d691ce426 100644 --- a/src/Magnum/DebugTools/ShapeRenderer.h +++ b/src/Magnum/DebugTools/ShapeRenderer.h @@ -33,7 +33,7 @@ #include "Magnum/SceneGraph/Drawable.h" #include "Magnum/Shapes/Shapes.h" #include "Magnum/Shapes/shapeImplementation.h" -#include "Magnum/DebugTools/magnumDebugToolsVisibility.h" +#include "Magnum/DebugTools/visibility.h" namespace Magnum { namespace DebugTools { diff --git a/src/Magnum/DebugTools/magnumDebugToolsVisibility.h b/src/Magnum/DebugTools/visibility.h similarity index 91% rename from src/Magnum/DebugTools/magnumDebugToolsVisibility.h rename to src/Magnum/DebugTools/visibility.h index ea27d813e..71077d7ad 100644 --- a/src/Magnum/DebugTools/magnumDebugToolsVisibility.h +++ b/src/Magnum/DebugTools/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_DebugTools_magnumDebugToolsVisibility_h -#define Magnum_DebugTools_magnumDebugToolsVisibility_h +#ifndef Magnum_DebugTools_visibility_h +#define Magnum_DebugTools_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumDebugTools_EXPORTS diff --git a/src/Magnum/Implementation/ShaderState.h b/src/Magnum/Implementation/ShaderState.h index 77031310a..345505870 100644 --- a/src/Magnum/Implementation/ShaderState.h +++ b/src/Magnum/Implementation/ShaderState.h @@ -26,7 +26,7 @@ #include "Magnum/OpenGL.h" #include "Magnum/Types.h" -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" namespace Magnum { namespace Implementation { diff --git a/src/Magnum/Magnum.h b/src/Magnum/Magnum.h index 4a36c74a2..940f270fc 100644 --- a/src/Magnum/Magnum.h +++ b/src/Magnum/Magnum.h @@ -31,7 +31,6 @@ #include #include "Magnum/Types.h" -#include "Magnum/magnumConfigure.h" #include "Magnum/Math/Math.h" #ifdef MAGNUM_BUILD_DEPRECATED diff --git a/src/Magnum/Math/Angle.h b/src/Magnum/Math/Angle.h index 61719b021..0e7b4fd23 100644 --- a/src/Magnum/Math/Angle.h +++ b/src/Magnum/Math/Angle.h @@ -31,7 +31,7 @@ #include #include -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" #include "Magnum/Math/Constants.h" #include "Magnum/Math/Math.h" #include "Magnum/Math/Unit.h" diff --git a/src/Magnum/Math/Functions.h b/src/Magnum/Math/Functions.h index 9734c5c93..f1e7777fa 100644 --- a/src/Magnum/Math/Functions.h +++ b/src/Magnum/Math/Functions.h @@ -33,7 +33,7 @@ #include #include -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" #include "Magnum/Math/Vector.h" namespace Magnum { namespace Math { diff --git a/src/Magnum/Math/Vector.h b/src/Magnum/Math/Vector.h index 02627fe01..b3901c86b 100644 --- a/src/Magnum/Math/Vector.h +++ b/src/Magnum/Math/Vector.h @@ -34,7 +34,7 @@ #include #include -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" #include "Magnum/Math/Angle.h" #include "Magnum/Math/BoolVector.h" #include "Magnum/Math/TypeTraits.h" diff --git a/src/Magnum/MeshTools/CMakeLists.txt b/src/Magnum/MeshTools/CMakeLists.txt index 8f47e0c20..ab0fe5d66 100644 --- a/src/Magnum/MeshTools/CMakeLists.txt +++ b/src/Magnum/MeshTools/CMakeLists.txt @@ -46,7 +46,7 @@ set(MagnumMeshTools_HEADERS Tipsify.h Transform.h - magnumMeshToolsVisibility.h) + visibility.h) # Set shared library flags for the objects, as they will be part of shared lib # TODO: fix when CMake sets target_EXPORTS for OBJECT targets as well diff --git a/src/Magnum/MeshTools/CompressIndices.h b/src/Magnum/MeshTools/CompressIndices.h index 0aa956a71..55b726576 100644 --- a/src/Magnum/MeshTools/CompressIndices.h +++ b/src/Magnum/MeshTools/CompressIndices.h @@ -31,7 +31,7 @@ #include #include "Magnum/Mesh.h" -#include "Magnum/MeshTools/magnumMeshToolsVisibility.h" +#include "Magnum/MeshTools/visibility.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/FlipNormals.h b/src/Magnum/MeshTools/FlipNormals.h index cc2a06283..a343cc1a1 100644 --- a/src/Magnum/MeshTools/FlipNormals.h +++ b/src/Magnum/MeshTools/FlipNormals.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/MeshTools/magnumMeshToolsVisibility.h" +#include "Magnum/MeshTools/visibility.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/FullScreenTriangle.h b/src/Magnum/MeshTools/FullScreenTriangle.h index 96256fd6f..e89fd95b4 100644 --- a/src/Magnum/MeshTools/FullScreenTriangle.h +++ b/src/Magnum/MeshTools/FullScreenTriangle.h @@ -32,7 +32,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/MeshTools/magnumMeshToolsVisibility.h" +#include "Magnum/MeshTools/visibility.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/GenerateFlatNormals.h b/src/Magnum/MeshTools/GenerateFlatNormals.h index 0ff158bfb..0ce4e28b0 100644 --- a/src/Magnum/MeshTools/GenerateFlatNormals.h +++ b/src/Magnum/MeshTools/GenerateFlatNormals.h @@ -32,7 +32,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/MeshTools/magnumMeshToolsVisibility.h" +#include "Magnum/MeshTools/visibility.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/Tipsify.h b/src/Magnum/MeshTools/Tipsify.h index 2b08d7da3..fb007c2ed 100644 --- a/src/Magnum/MeshTools/Tipsify.h +++ b/src/Magnum/MeshTools/Tipsify.h @@ -31,7 +31,7 @@ #include #include "Magnum/Types.h" -#include "Magnum/MeshTools/magnumMeshToolsVisibility.h" +#include "Magnum/MeshTools/visibility.h" namespace Magnum { namespace MeshTools { diff --git a/src/Magnum/MeshTools/magnumMeshToolsVisibility.h b/src/Magnum/MeshTools/visibility.h similarity index 91% rename from src/Magnum/MeshTools/magnumMeshToolsVisibility.h rename to src/Magnum/MeshTools/visibility.h index c6a91ef5c..876020128 100644 --- a/src/Magnum/MeshTools/magnumMeshToolsVisibility.h +++ b/src/Magnum/MeshTools/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_MeshTools_magnumMeshToolsVisibility_h -#define Magnum_MeshTools_magnumMeshToolsVisibility_h +#ifndef Magnum_MeshTools_visibility_h +#define Magnum_MeshTools_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #if defined(MagnumMeshTools_EXPORTS) || defined(MagnumMeshToolsObjects_EXPORTS) diff --git a/src/Magnum/MeshView.h b/src/Magnum/MeshView.h index 20a50e6e1..72d72b83d 100644 --- a/src/Magnum/MeshView.h +++ b/src/Magnum/MeshView.h @@ -30,7 +30,7 @@ #include "Magnum/Magnum.h" #include "Magnum/OpenGL.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/OpenGL.h b/src/Magnum/OpenGL.h index 0171d3c04..9cbade659 100644 --- a/src/Magnum/OpenGL.h +++ b/src/Magnum/OpenGL.h @@ -30,7 +30,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" /** @todo Remove NaCl workaround when not needed */ diff --git a/src/Magnum/Primitives/CMakeLists.txt b/src/Magnum/Primitives/CMakeLists.txt index c58cb02df..2d930edbc 100644 --- a/src/Magnum/Primitives/CMakeLists.txt +++ b/src/Magnum/Primitives/CMakeLists.txt @@ -49,7 +49,7 @@ set(MagnumPrimitives_HEADERS Square.h UVSphere.h - magnumPrimitivesVisibility.h) + visibility.h) add_library(MagnumPrimitives ${SHARED_OR_STATIC} ${MagnumPrimitives_SRCS}) if(BUILD_STATIC_PIC) diff --git a/src/Magnum/Primitives/Capsule.h b/src/Magnum/Primitives/Capsule.h index 937ab1f49..42024300c 100644 --- a/src/Magnum/Primitives/Capsule.h +++ b/src/Magnum/Primitives/Capsule.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Primitives::Capsule */ -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Circle.h b/src/Magnum/Primitives/Circle.h index 26a747bc3..6f0c45247 100644 --- a/src/Magnum/Primitives/Circle.h +++ b/src/Magnum/Primitives/Circle.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Primitives::Circle */ -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Crosshair.h b/src/Magnum/Primitives/Crosshair.h index 76ac2e1ba..3c48354f1 100644 --- a/src/Magnum/Primitives/Crosshair.h +++ b/src/Magnum/Primitives/Crosshair.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Primitives::Crosshair2D, Magnum::Primitives::Crosshair3D */ -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Cube.h b/src/Magnum/Primitives/Cube.h index 7007ebb54..a1bc9681f 100644 --- a/src/Magnum/Primitives/Cube.h +++ b/src/Magnum/Primitives/Cube.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Primitives::Cube */ -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Cylinder.h b/src/Magnum/Primitives/Cylinder.h index 4a6e93f14..5e696f166 100644 --- a/src/Magnum/Primitives/Cylinder.h +++ b/src/Magnum/Primitives/Cylinder.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Icosphere.h b/src/Magnum/Primitives/Icosphere.h index 17afc4734..72eee9fa1 100644 --- a/src/Magnum/Primitives/Icosphere.h +++ b/src/Magnum/Primitives/Icosphere.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Primitives::Icosphere */ -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Line.h b/src/Magnum/Primitives/Line.h index 05c0743b9..a82a8d682 100644 --- a/src/Magnum/Primitives/Line.h +++ b/src/Magnum/Primitives/Line.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Primitives::Line2D, Magnum::Primitives::Line3D */ -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Plane.h b/src/Magnum/Primitives/Plane.h index 7601d1cf5..20abc3ce6 100644 --- a/src/Magnum/Primitives/Plane.h +++ b/src/Magnum/Primitives/Plane.h @@ -29,7 +29,7 @@ */ #include "Magnum/Trade/Trade.h" -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/Square.h b/src/Magnum/Primitives/Square.h index 9b8fae70d..eb88743e4 100644 --- a/src/Magnum/Primitives/Square.h +++ b/src/Magnum/Primitives/Square.h @@ -28,7 +28,7 @@ * @brief Class Magnum::Primitives::Square */ -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" #include "Magnum/Trade/Trade.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/UVSphere.h b/src/Magnum/Primitives/UVSphere.h index cc10c5980..1238527cc 100644 --- a/src/Magnum/Primitives/UVSphere.h +++ b/src/Magnum/Primitives/UVSphere.h @@ -29,7 +29,7 @@ */ #include "Magnum/Trade/Trade.h" -#include "Magnum/Primitives/magnumPrimitivesVisibility.h" +#include "Magnum/Primitives/visibility.h" namespace Magnum { namespace Primitives { diff --git a/src/Magnum/Primitives/magnumPrimitivesVisibility.h b/src/Magnum/Primitives/visibility.h similarity index 91% rename from src/Magnum/Primitives/magnumPrimitivesVisibility.h rename to src/Magnum/Primitives/visibility.h index aa795f436..8dca7d5cb 100644 --- a/src/Magnum/Primitives/magnumPrimitivesVisibility.h +++ b/src/Magnum/Primitives/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Primitives_magnumPrimitivesVisibility_h -#define Magnum_Primitives_magnumPrimitivesVisibility_h +#ifndef Magnum_Primitives_visibility_h +#define Magnum_Primitives_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumPrimitives_EXPORTS diff --git a/src/Magnum/Query.h b/src/Magnum/Query.h index 97e8ea4f2..3f0000610 100644 --- a/src/Magnum/Query.h +++ b/src/Magnum/Query.h @@ -31,7 +31,7 @@ #include #include "Magnum/AbstractObject.h" -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" namespace Magnum { diff --git a/src/Magnum/Renderbuffer.h b/src/Magnum/Renderbuffer.h index 76de3a35f..e4bf5e6b1 100644 --- a/src/Magnum/Renderbuffer.h +++ b/src/Magnum/Renderbuffer.h @@ -30,7 +30,6 @@ #include "Magnum/AbstractObject.h" #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/Renderer.h b/src/Magnum/Renderer.h index ee16d7f7c..5d5dc675d 100644 --- a/src/Magnum/Renderer.h +++ b/src/Magnum/Renderer.h @@ -32,7 +32,7 @@ #include "Magnum/Magnum.h" #include "Magnum/OpenGL.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/Resource.h b/src/Magnum/Resource.h index 1765fcec8..38fcfbd96 100644 --- a/src/Magnum/Resource.h +++ b/src/Magnum/Resource.h @@ -32,7 +32,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/Sampler.h b/src/Magnum/Sampler.h index 111298d5e..b1d0e74e3 100644 --- a/src/Magnum/Sampler.h +++ b/src/Magnum/Sampler.h @@ -30,7 +30,7 @@ #include "Magnum/Magnum.h" #include "Magnum/OpenGL.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/SceneGraph/AbstractCamera.h b/src/Magnum/SceneGraph/AbstractCamera.h index 229f228f2..ccfcf6f2b 100644 --- a/src/Magnum/SceneGraph/AbstractCamera.h +++ b/src/Magnum/SceneGraph/AbstractCamera.h @@ -31,7 +31,7 @@ #include "Magnum/Math/Matrix3.h" #include "Magnum/Math/Matrix4.h" #include "Magnum/SceneGraph/AbstractFeature.h" -#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/visibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AbstractObject.h b/src/Magnum/SceneGraph/AbstractObject.h index c9f157674..6c64963ec 100644 --- a/src/Magnum/SceneGraph/AbstractObject.h +++ b/src/Magnum/SceneGraph/AbstractObject.h @@ -33,7 +33,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/SceneGraph/SceneGraph.h" -#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/visibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AbstractTransformation.h b/src/Magnum/SceneGraph/AbstractTransformation.h index fe8c1e759..6ebfb8998 100644 --- a/src/Magnum/SceneGraph/AbstractTransformation.h +++ b/src/Magnum/SceneGraph/AbstractTransformation.h @@ -29,7 +29,7 @@ */ #include "Magnum/SceneGraph/SceneGraph.h" -#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/visibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/Animable.h b/src/Magnum/SceneGraph/Animable.h index db595566f..be3b3467e 100644 --- a/src/Magnum/SceneGraph/Animable.h +++ b/src/Magnum/SceneGraph/Animable.h @@ -29,7 +29,7 @@ */ #include "Magnum/SceneGraph/AbstractGroupedFeature.h" -#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/visibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/AnimableGroup.h b/src/Magnum/SceneGraph/AnimableGroup.h index 5a4bfe47f..73955bc3a 100644 --- a/src/Magnum/SceneGraph/AnimableGroup.h +++ b/src/Magnum/SceneGraph/AnimableGroup.h @@ -29,7 +29,7 @@ */ #include "Magnum/SceneGraph/FeatureGroup.h" -#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/visibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/CMakeLists.txt b/src/Magnum/SceneGraph/CMakeLists.txt index 72822a81a..347668e6c 100644 --- a/src/Magnum/SceneGraph/CMakeLists.txt +++ b/src/Magnum/SceneGraph/CMakeLists.txt @@ -66,7 +66,7 @@ set(MagnumSceneGraph_HEADERS SceneGraph.h TranslationTransformation.h - magnumSceneGraphVisibility.h) + visibility.h) # Set shared library flags for the objects, as they will be part of shared lib # TODO: fix when CMake sets target_EXPORTS for OBJECT targets as well diff --git a/src/Magnum/SceneGraph/FeatureGroup.h b/src/Magnum/SceneGraph/FeatureGroup.h index 043ff2099..7becfe9a7 100644 --- a/src/Magnum/SceneGraph/FeatureGroup.h +++ b/src/Magnum/SceneGraph/FeatureGroup.h @@ -32,7 +32,7 @@ #include #include "Magnum/SceneGraph/SceneGraph.h" -#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/visibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/Object.h b/src/Magnum/SceneGraph/Object.h index a5ac2225a..1be32a566 100644 --- a/src/Magnum/SceneGraph/Object.h +++ b/src/Magnum/SceneGraph/Object.h @@ -32,7 +32,7 @@ #include "Magnum/SceneGraph/AbstractFeature.h" #include "Magnum/SceneGraph/AbstractObject.h" -#include "Magnum/SceneGraph/magnumSceneGraphVisibility.h" +#include "Magnum/SceneGraph/visibility.h" namespace Magnum { namespace SceneGraph { diff --git a/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h b/src/Magnum/SceneGraph/visibility.h similarity index 91% rename from src/Magnum/SceneGraph/magnumSceneGraphVisibility.h rename to src/Magnum/SceneGraph/visibility.h index acedc76fd..9845594a5 100644 --- a/src/Magnum/SceneGraph/magnumSceneGraphVisibility.h +++ b/src/Magnum/SceneGraph/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_SceneGraph_magnumSceneGraphVisibility_h -#define Magnum_SceneGraph_magnumSceneGraphVisibility_h +#ifndef Magnum_SceneGraph_visibility_h +#define Magnum_SceneGraph_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #if defined(MagnumSceneGraph_EXPORTS) || defined(MagnumSceneGraphObjects_EXPORTS) diff --git a/src/Magnum/Shader.h b/src/Magnum/Shader.h index 40311f999..47680a114 100644 --- a/src/Magnum/Shader.h +++ b/src/Magnum/Shader.h @@ -33,7 +33,6 @@ #include "Magnum/AbstractObject.h" #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" namespace Magnum { diff --git a/src/Magnum/Shaders/CMakeLists.txt b/src/Magnum/Shaders/CMakeLists.txt index cd66e8b93..42d1b642e 100644 --- a/src/Magnum/Shaders/CMakeLists.txt +++ b/src/Magnum/Shaders/CMakeLists.txt @@ -44,7 +44,7 @@ set(MagnumShaders_HEADERS Vector.h VertexColor.h - magnumShadersVisibility.h) + visibility.h) if(BUILD_STATIC) set(MagnumShaders_HEADERS ${MagnumShaders_HEADERS} magnumShadersResourceImport.hpp) diff --git a/src/Magnum/Shaders/DistanceFieldVector.h b/src/Magnum/Shaders/DistanceFieldVector.h index 43642f7f1..335d3aec6 100644 --- a/src/Magnum/Shaders/DistanceFieldVector.h +++ b/src/Magnum/Shaders/DistanceFieldVector.h @@ -33,7 +33,7 @@ #include "Magnum/Math/Matrix3.h" #include "Magnum/Math/Matrix4.h" #include "Magnum/Shaders/AbstractVector.h" -#include "Magnum/Shaders/magnumShadersVisibility.h" +#include "Magnum/Shaders/visibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/Flat.h b/src/Magnum/Shaders/Flat.h index 345721788..0fc86d603 100644 --- a/src/Magnum/Shaders/Flat.h +++ b/src/Magnum/Shaders/Flat.h @@ -33,7 +33,7 @@ #include "Magnum/Math/Matrix3.h" #include "Magnum/Math/Matrix4.h" #include "Magnum/Shaders/Generic.h" -#include "Magnum/Shaders/magnumShadersVisibility.h" +#include "Magnum/Shaders/visibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/MeshVisualizer.h b/src/Magnum/Shaders/MeshVisualizer.h index d1caf439e..76f006653 100644 --- a/src/Magnum/Shaders/MeshVisualizer.h +++ b/src/Magnum/Shaders/MeshVisualizer.h @@ -32,7 +32,7 @@ #include "Magnum/AbstractShaderProgram.h" #include "Magnum/Color.h" -#include "Magnum/Shaders/magnumShadersVisibility.h" +#include "Magnum/Shaders/visibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/Phong.h b/src/Magnum/Shaders/Phong.h index 81958035b..83b20160e 100644 --- a/src/Magnum/Shaders/Phong.h +++ b/src/Magnum/Shaders/Phong.h @@ -31,7 +31,7 @@ #include "Magnum/Color.h" #include "Magnum/Math/Matrix4.h" #include "Magnum/Shaders/Generic.h" -#include "Magnum/Shaders/magnumShadersVisibility.h" +#include "Magnum/Shaders/visibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/Vector.h b/src/Magnum/Shaders/Vector.h index e3415d17f..fac824290 100644 --- a/src/Magnum/Shaders/Vector.h +++ b/src/Magnum/Shaders/Vector.h @@ -33,7 +33,7 @@ #include "Magnum/Math/Matrix3.h" #include "Magnum/Math/Matrix4.h" #include "Magnum/Shaders/AbstractVector.h" -#include "Magnum/Shaders/magnumShadersVisibility.h" +#include "Magnum/Shaders/visibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/VertexColor.h b/src/Magnum/Shaders/VertexColor.h index 99af6fdd0..c80330da4 100644 --- a/src/Magnum/Shaders/VertexColor.h +++ b/src/Magnum/Shaders/VertexColor.h @@ -33,7 +33,7 @@ #include "Magnum/Math/Matrix3.h" #include "Magnum/Math/Matrix4.h" #include "Magnum/Shaders/Generic.h" -#include "Magnum/Shaders/magnumShadersVisibility.h" +#include "Magnum/Shaders/visibility.h" namespace Magnum { namespace Shaders { diff --git a/src/Magnum/Shaders/magnumShadersResourceImport.hpp b/src/Magnum/Shaders/magnumShadersResourceImport.hpp index 08168a481..9aed71540 100644 --- a/src/Magnum/Shaders/magnumShadersResourceImport.hpp +++ b/src/Magnum/Shaders/magnumShadersResourceImport.hpp @@ -24,7 +24,7 @@ DEALINGS IN THE SOFTWARE. */ -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifdef MAGNUM_BUILD_STATIC #include diff --git a/src/Magnum/Shaders/magnumShadersVisibility.h b/src/Magnum/Shaders/visibility.h similarity index 97% rename from src/Magnum/Shaders/magnumShadersVisibility.h rename to src/Magnum/Shaders/visibility.h index 22e80b7ea..6a9400db4 100644 --- a/src/Magnum/Shaders/magnumShadersVisibility.h +++ b/src/Magnum/Shaders/visibility.h @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumShaders_EXPORTS diff --git a/src/Magnum/Shapes/AbstractShape.h b/src/Magnum/Shapes/AbstractShape.h index c1dc7ea19..ae7bd56e2 100644 --- a/src/Magnum/Shapes/AbstractShape.h +++ b/src/Magnum/Shapes/AbstractShape.h @@ -30,9 +30,9 @@ #include "Magnum/Magnum.h" #include "Magnum/DimensionTraits.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" -#include "Magnum/Shapes/shapeImplementation.h" #include "Magnum/SceneGraph/AbstractGroupedFeature.h" +#include "Magnum/Shapes/shapeImplementation.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/AxisAlignedBox.h b/src/Magnum/Shapes/AxisAlignedBox.h index 39edbc3ea..f9e1574db 100644 --- a/src/Magnum/Shapes/AxisAlignedBox.h +++ b/src/Magnum/Shapes/AxisAlignedBox.h @@ -31,7 +31,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Math/Vector3.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Box.h b/src/Magnum/Shapes/Box.h index 424005127..84ba50c58 100644 --- a/src/Magnum/Shapes/Box.h +++ b/src/Magnum/Shapes/Box.h @@ -31,7 +31,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Math/Matrix3.h" #include "Magnum/Math/Matrix4.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/CMakeLists.txt b/src/Magnum/Shapes/CMakeLists.txt index 992639f60..1528ad5d6 100644 --- a/src/Magnum/Shapes/CMakeLists.txt +++ b/src/Magnum/Shapes/CMakeLists.txt @@ -57,8 +57,8 @@ set(MagnumShapes_HEADERS Point.h Sphere.h - magnumShapesVisibility.h - shapeImplementation.h) + shapeImplementation.h + visibility.h) add_library(MagnumShapes ${SHARED_OR_STATIC} ${MagnumShapes_SRCS}) if(BUILD_STATIC_PIC) diff --git a/src/Magnum/Shapes/Capsule.h b/src/Magnum/Shapes/Capsule.h index f6e2eb223..e67ea1be2 100644 --- a/src/Magnum/Shapes/Capsule.h +++ b/src/Magnum/Shapes/Capsule.h @@ -31,7 +31,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Math/Vector3.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Composition.h b/src/Magnum/Shapes/Composition.h index 1b5b107b3..8b18a1e50 100644 --- a/src/Magnum/Shapes/Composition.h +++ b/src/Magnum/Shapes/Composition.h @@ -35,8 +35,8 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" #include "Magnum/Shapes/shapeImplementation.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Cylinder.h b/src/Magnum/Shapes/Cylinder.h index 0d9401c88..b19dedf2a 100644 --- a/src/Magnum/Shapes/Cylinder.h +++ b/src/Magnum/Shapes/Cylinder.h @@ -31,7 +31,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Math/Vector3.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Line.h b/src/Magnum/Shapes/Line.h index 64a67834c..4c9e9f391 100644 --- a/src/Magnum/Shapes/Line.h +++ b/src/Magnum/Shapes/Line.h @@ -30,7 +30,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Math/Vector3.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Plane.h b/src/Magnum/Shapes/Plane.h index cd514c412..1b2e5e7d7 100644 --- a/src/Magnum/Shapes/Plane.h +++ b/src/Magnum/Shapes/Plane.h @@ -31,7 +31,7 @@ #include "Magnum/Magnum.h" #include "Magnum/Math/Vector3.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Point.h b/src/Magnum/Shapes/Point.h index cebc0d037..380b6ceda 100644 --- a/src/Magnum/Shapes/Point.h +++ b/src/Magnum/Shapes/Point.h @@ -30,7 +30,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Math/Vector3.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Shape.h b/src/Magnum/Shapes/Shape.h index 2170010d7..6314e63da 100644 --- a/src/Magnum/Shapes/Shape.h +++ b/src/Magnum/Shapes/Shape.h @@ -30,7 +30,7 @@ #include "Magnum/Shapes/AbstractShape.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/ShapeGroup.h b/src/Magnum/Shapes/ShapeGroup.h index 3f1c8e5c5..c52419b27 100644 --- a/src/Magnum/Shapes/ShapeGroup.h +++ b/src/Magnum/Shapes/ShapeGroup.h @@ -32,7 +32,7 @@ #include "Magnum/SceneGraph/FeatureGroup.h" #include "Magnum/Shapes/AbstractShape.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/Sphere.h b/src/Magnum/Shapes/Sphere.h index c7991f733..2223b4799 100644 --- a/src/Magnum/Shapes/Sphere.h +++ b/src/Magnum/Shapes/Sphere.h @@ -32,7 +32,7 @@ #include "Magnum/Math/Vector3.h" #include "Magnum/Shapes/Collision.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { diff --git a/src/Magnum/Shapes/shapeImplementation.h b/src/Magnum/Shapes/shapeImplementation.h index ef7fa1cc3..fc6a68da5 100644 --- a/src/Magnum/Shapes/shapeImplementation.h +++ b/src/Magnum/Shapes/shapeImplementation.h @@ -31,7 +31,7 @@ #include "Magnum/DimensionTraits.h" #include "Magnum/Magnum.h" #include "Magnum/Shapes/Shapes.h" -#include "Magnum/Shapes/magnumShapesVisibility.h" +#include "Magnum/Shapes/visibility.h" namespace Magnum { namespace Shapes { namespace Implementation { diff --git a/src/Magnum/Shapes/magnumShapesVisibility.h b/src/Magnum/Shapes/visibility.h similarity index 92% rename from src/Magnum/Shapes/magnumShapesVisibility.h rename to src/Magnum/Shapes/visibility.h index 94d163e2b..c0ae3226f 100644 --- a/src/Magnum/Shapes/magnumShapesVisibility.h +++ b/src/Magnum/Shapes/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Shapes_magnumShapesVisibility_h -#define Magnum_Shapes_magnumShapesVisibility_h +#ifndef Magnum_Shapes_visibility_h +#define Magnum_Shapes_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumShapes_EXPORTS diff --git a/src/Magnum/Test/CMakeLists.txt b/src/Magnum/Test/CMakeLists.txt index f3d69c991..8beda53b4 100644 --- a/src/Magnum/Test/CMakeLists.txt +++ b/src/Magnum/Test/CMakeLists.txt @@ -70,9 +70,9 @@ if(BUILD_GL_TESTS) ${QueryGLTest_RES} LIBRARIES ${GL_TEST_LIBRARIES}) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ShaderGLTestConfigure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/ShaderGLTestConfigure.h) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h) + include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(ShaderGLTest ShaderGLTest.cpp LIBRARIES ${GL_TEST_LIBRARIES}) if(NOT MAGNUM_TARGET_GLES2) diff --git a/src/Magnum/Test/ShaderGLTest.cpp b/src/Magnum/Test/ShaderGLTest.cpp index a8d091c6c..90f5a5cd6 100644 --- a/src/Magnum/Test/ShaderGLTest.cpp +++ b/src/Magnum/Test/ShaderGLTest.cpp @@ -29,7 +29,7 @@ #include "Magnum/Shader.h" #include "Magnum/Test/AbstractOpenGLTester.h" -#include "ShaderGLTestConfigure.h" +#include "configure.h" namespace Magnum { namespace Test { diff --git a/src/Magnum/Test/ShaderGLTestConfigure.h.cmake b/src/Magnum/Test/configure.h.cmake similarity index 100% rename from src/Magnum/Test/ShaderGLTestConfigure.h.cmake rename to src/Magnum/Test/configure.h.cmake diff --git a/src/Magnum/Text/AbstractFont.h b/src/Magnum/Text/AbstractFont.h index 4b4e6c66c..6c344a317 100644 --- a/src/Magnum/Text/AbstractFont.h +++ b/src/Magnum/Text/AbstractFont.h @@ -36,7 +36,7 @@ #include "Magnum/Magnum.h" #include "Magnum/Texture.h" #include "Magnum/Text/Text.h" -#include "Magnum/Text/magnumTextVisibility.h" +#include "Magnum/Text/visibility.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/AbstractFontConverter.h b/src/Magnum/Text/AbstractFontConverter.h index ab7fde66a..fcd628ffd 100644 --- a/src/Magnum/Text/AbstractFontConverter.h +++ b/src/Magnum/Text/AbstractFontConverter.h @@ -33,7 +33,7 @@ #include "Magnum/Magnum.h" #include "Magnum/Text/Text.h" -#include "Magnum/Text/magnumTextVisibility.h" +#include "Magnum/Text/visibility.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/CMakeLists.txt b/src/Magnum/Text/CMakeLists.txt index 8f61ce1fe..6302f5c9f 100644 --- a/src/Magnum/Text/CMakeLists.txt +++ b/src/Magnum/Text/CMakeLists.txt @@ -37,7 +37,7 @@ set(MagnumText_HEADERS Renderer.h Text.h - magnumTextVisibility.h) + visibility.h) if(MAGNUM_BUILD_DEPRECATED) set(MagnumText_HEADERS ${MagnumText_HEADERS} @@ -65,7 +65,7 @@ if(WITH_FONTCONVERTER) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/configure.h) - include_directories(${CMAKE_CURRENT_BINARY_DIR}) + include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) add_executable(magnum-fontconverter fontconverter.cpp) target_link_libraries(magnum-fontconverter MagnumText Magnum MagnumWindowlessGlxApplication ${X11_LIBRARIES}) diff --git a/src/Magnum/Text/GlyphCache.h b/src/Magnum/Text/GlyphCache.h index 9b841e55c..6289c64cc 100644 --- a/src/Magnum/Text/GlyphCache.h +++ b/src/Magnum/Text/GlyphCache.h @@ -33,7 +33,7 @@ #include "Magnum/Math/Range.h" #include "Magnum/Texture.h" -#include "Magnum/Text/magnumTextVisibility.h" +#include "Magnum/Text/visibility.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/Renderer.h b/src/Magnum/Text/Renderer.h index 820da2bfb..f00eceff5 100644 --- a/src/Magnum/Text/Renderer.h +++ b/src/Magnum/Text/Renderer.h @@ -38,7 +38,7 @@ #include "Magnum/Mesh.h" #include "Magnum/Text/Text.h" #include "Magnum/Text/Alignment.h" -#include "Magnum/Text/magnumTextVisibility.h" +#include "Magnum/Text/visibility.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp index 5df0f7656..7526f4ceb 100644 --- a/src/Magnum/Text/Test/AbstractFontConverterTest.cpp +++ b/src/Magnum/Text/Test/AbstractFontConverterTest.cpp @@ -30,7 +30,7 @@ #include "Magnum/Text/AbstractFontConverter.h" #include "Magnum/Text/GlyphCache.h" -#include "testConfigure.h" +#include "configure.h" namespace Magnum { namespace Text { namespace Test { diff --git a/src/Magnum/Text/Test/AbstractFontTest.cpp b/src/Magnum/Text/Test/AbstractFontTest.cpp index 15250ebb9..b52ae5181 100644 --- a/src/Magnum/Text/Test/AbstractFontTest.cpp +++ b/src/Magnum/Text/Test/AbstractFontTest.cpp @@ -28,7 +28,7 @@ #include "Magnum/Text/AbstractFont.h" -#include "testConfigure.h" +#include "configure.h" namespace Magnum { namespace Text { namespace Test { diff --git a/src/Magnum/Text/Test/CMakeLists.txt b/src/Magnum/Text/Test/CMakeLists.txt index e48529eaa..62f613fa1 100644 --- a/src/Magnum/Text/Test/CMakeLists.txt +++ b/src/Magnum/Text/Test/CMakeLists.txt @@ -22,10 +22,10 @@ # DEALINGS IN THE SOFTWARE. # -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testConfigure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/testConfigure.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(TextAbstractFontTest AbstractFontTest.cpp LIBRARIES Magnum MagnumText) corrade_add_test(TextAbstractFontConverterTest AbstractFontConverterTest.cpp LIBRARIES Magnum MagnumText) diff --git a/src/Magnum/Text/Test/testConfigure.h.cmake b/src/Magnum/Text/Test/configure.h.cmake similarity index 100% rename from src/Magnum/Text/Test/testConfigure.h.cmake rename to src/Magnum/Text/Test/configure.h.cmake diff --git a/src/Magnum/Text/Text.h b/src/Magnum/Text/Text.h index 01440e0c9..3b518812e 100644 --- a/src/Magnum/Text/Text.h +++ b/src/Magnum/Text/Text.h @@ -29,7 +29,7 @@ */ #include "Magnum/Types.h" -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" namespace Magnum { namespace Text { diff --git a/src/Magnum/Text/magnumTextVisibility.h b/src/Magnum/Text/visibility.h similarity index 92% rename from src/Magnum/Text/magnumTextVisibility.h rename to src/Magnum/Text/visibility.h index b00be6019..9bf30e9a9 100644 --- a/src/Magnum/Text/magnumTextVisibility.h +++ b/src/Magnum/Text/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_Text_magnumTextVisibility_h -#define Magnum_Text_magnumTextVisibility_h +#ifndef Magnum_Text_visibility_h +#define Magnum_Text_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumText_EXPORTS diff --git a/src/Magnum/TextureTools/CMakeLists.txt b/src/Magnum/TextureTools/CMakeLists.txt index 05623f9c0..cf6871bda 100644 --- a/src/Magnum/TextureTools/CMakeLists.txt +++ b/src/Magnum/TextureTools/CMakeLists.txt @@ -51,8 +51,8 @@ if(WITH_DISTANCEFIELDCONVERTER) message(FATAL_ERROR "magnum-distancefieldconverter is not available on this platform. Set WITH_DISTANCEFIELDCONVERTER to OFF to suppress this warning.") endif() - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/distancefieldconverterConfigure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/distancefieldconverterConfigure.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/src/Magnum/TextureTools/distancefieldconverter.cpp b/src/Magnum/TextureTools/distancefieldconverter.cpp index 954f92fc5..876a4f1f6 100644 --- a/src/Magnum/TextureTools/distancefieldconverter.cpp +++ b/src/Magnum/TextureTools/distancefieldconverter.cpp @@ -37,7 +37,7 @@ #include "Magnum/Trade/AbstractImageConverter.h" #include "Magnum/Trade/ImageData.h" -#include "configure.h" +#include "distancefieldconverterConfigure.h" namespace Magnum { namespace TextureTools { diff --git a/src/Magnum/TextureTools/configure.h.cmake b/src/Magnum/TextureTools/distancefieldconverterConfigure.h.cmake similarity index 100% rename from src/Magnum/TextureTools/configure.h.cmake rename to src/Magnum/TextureTools/distancefieldconverterConfigure.h.cmake diff --git a/src/Magnum/TextureTools/magnumTextureToolsVisibility.h b/src/Magnum/TextureTools/magnumTextureToolsVisibility.h index d1fd6a7fa..68ea9e6c4 100644 --- a/src/Magnum/TextureTools/magnumTextureToolsVisibility.h +++ b/src/Magnum/TextureTools/magnumTextureToolsVisibility.h @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #ifdef MagnumTextureTools_EXPORTS diff --git a/src/Magnum/Timeline.h b/src/Magnum/Timeline.h index 1a31fdbbf..c774c4a5e 100644 --- a/src/Magnum/Timeline.h +++ b/src/Magnum/Timeline.h @@ -31,7 +31,7 @@ #include #include "Magnum/Types.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/Trade/AbstractImageConverter.h b/src/Magnum/Trade/AbstractImageConverter.h index ab679cf06..4601c620f 100644 --- a/src/Magnum/Trade/AbstractImageConverter.h +++ b/src/Magnum/Trade/AbstractImageConverter.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" #include "Magnum/Text/Text.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/AbstractImporter.h b/src/Magnum/Trade/AbstractImporter.h index 69626fb38..602aad875 100644 --- a/src/Magnum/Trade/AbstractImporter.h +++ b/src/Magnum/Trade/AbstractImporter.h @@ -33,7 +33,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" #include "Magnum/Trade/Trade.h" #include "MagnumExternal/Optional/optional.hpp" diff --git a/src/Magnum/Trade/AbstractMaterialData.h b/src/Magnum/Trade/AbstractMaterialData.h index 2d278134a..26247d7e8 100644 --- a/src/Magnum/Trade/AbstractMaterialData.h +++ b/src/Magnum/Trade/AbstractMaterialData.h @@ -29,7 +29,7 @@ */ #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/MeshData2D.h b/src/Magnum/Trade/MeshData2D.h index 3a61a5482..0ba2f024d 100644 --- a/src/Magnum/Trade/MeshData2D.h +++ b/src/Magnum/Trade/MeshData2D.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/MeshData3D.h b/src/Magnum/Trade/MeshData3D.h index 5bd92a702..6780922f6 100644 --- a/src/Magnum/Trade/MeshData3D.h +++ b/src/Magnum/Trade/MeshData3D.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/SceneData.h b/src/Magnum/Trade/SceneData.h index e8f99ad0e..a37ba850a 100644 --- a/src/Magnum/Trade/SceneData.h +++ b/src/Magnum/Trade/SceneData.h @@ -32,7 +32,7 @@ #include #include "Magnum/Types.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp index bfa8ec510..dc538fc97 100644 --- a/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImageConverterTest.cpp @@ -31,7 +31,7 @@ #include "Magnum/ImageReference.h" #include "Magnum/Trade/AbstractImageConverter.h" -#include "testConfigure.h" +#include "configure.h" namespace Magnum { namespace Trade { namespace Test { diff --git a/src/Magnum/Trade/Test/AbstractImporterTest.cpp b/src/Magnum/Trade/Test/AbstractImporterTest.cpp index f41b1bbab..15fe9caee 100644 --- a/src/Magnum/Trade/Test/AbstractImporterTest.cpp +++ b/src/Magnum/Trade/Test/AbstractImporterTest.cpp @@ -28,7 +28,7 @@ #include "Magnum/Trade/AbstractImporter.h" -#include "testConfigure.h" +#include "configure.h" namespace Magnum { namespace Trade { namespace Test { diff --git a/src/Magnum/Trade/Test/CMakeLists.txt b/src/Magnum/Trade/Test/CMakeLists.txt index d1a162e92..8a3bd4515 100644 --- a/src/Magnum/Trade/Test/CMakeLists.txt +++ b/src/Magnum/Trade/Test/CMakeLists.txt @@ -22,10 +22,10 @@ # DEALINGS IN THE SOFTWARE. # -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/testConfigure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/testConfigure.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(TradeAbstractImageConverterTest AbstractImageConverterTest.cpp LIBRARIES Magnum) corrade_add_test(TradeAbstractImporterTest AbstractImporterTest.cpp LIBRARIES Magnum) diff --git a/src/Magnum/Trade/Test/testConfigure.h.cmake b/src/Magnum/Trade/Test/configure.h.cmake similarity index 100% rename from src/Magnum/Trade/Test/testConfigure.h.cmake rename to src/Magnum/Trade/Test/configure.h.cmake diff --git a/src/Magnum/Trade/TextureData.h b/src/Magnum/Trade/TextureData.h index 485f11afc..1a95049c9 100644 --- a/src/Magnum/Trade/TextureData.h +++ b/src/Magnum/Trade/TextureData.h @@ -30,7 +30,7 @@ #include "Magnum/Array.h" #include "Magnum/Sampler.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { namespace Trade { diff --git a/src/Magnum/Types.h b/src/Magnum/Types.h index 4c0d75140..bd332b6b8 100644 --- a/src/Magnum/Types.h +++ b/src/Magnum/Types.h @@ -30,7 +30,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" namespace Magnum { diff --git a/src/Magnum/Version.h b/src/Magnum/Version.h index 10b8bedae..68c59a77b 100644 --- a/src/Magnum/Version.h +++ b/src/Magnum/Version.h @@ -31,7 +31,7 @@ #include #include "Magnum/Magnum.h" -#include "Magnum/magnumVisibility.h" +#include "Magnum/visibility.h" namespace Magnum { diff --git a/src/Magnum/magnumConfigure.h.cmake b/src/Magnum/configure.h.cmake similarity index 100% rename from src/Magnum/magnumConfigure.h.cmake rename to src/Magnum/configure.h.cmake diff --git a/src/Magnum/magnumVisibility.h b/src/Magnum/visibility.h similarity index 93% rename from src/Magnum/magnumVisibility.h rename to src/Magnum/visibility.h index 250e01701..abcadc967 100644 --- a/src/Magnum/magnumVisibility.h +++ b/src/Magnum/visibility.h @@ -1,5 +1,5 @@ -#ifndef Magnum_magnumVisibility_h -#define Magnum_magnumVisibility_h +#ifndef Magnum_visibility_h +#define Magnum_visibility_h /* This file is part of Magnum. @@ -26,7 +26,7 @@ #include -#include "Magnum/magnumConfigure.h" +#include "Magnum/configure.h" #ifndef MAGNUM_BUILD_STATIC #if defined(Magnum_EXPORTS) || defined(MagnumMathObjects_EXPORTS) diff --git a/src/MagnumPlugins/MagnumFont/CMakeLists.txt b/src/MagnumPlugins/MagnumFont/CMakeLists.txt index 8c6a47117..fbff53fea 100644 --- a/src/MagnumPlugins/MagnumFont/CMakeLists.txt +++ b/src/MagnumPlugins/MagnumFont/CMakeLists.txt @@ -34,7 +34,7 @@ set_target_properties(MagnumFontObjects PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED add_plugin(MagnumFont ${MAGNUM_PLUGINS_FONT_INSTALL_DIR} MagnumFont.conf $ - pluginRegistrationMagnumFont.cpp) + pluginRegistration.cpp) target_link_libraries(MagnumFont Magnum MagnumText) if(WIN32) diff --git a/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt b/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt index 4b91644ed..4f1d89ded 100644 --- a/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt +++ b/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt @@ -22,9 +22,9 @@ # DEALINGS IN THE SOFTWARE. # -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/magnumFontTestConfigure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/magnumFontTestConfigure.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(MagnumFontGLTest MagnumFontGLTest.cpp LIBRARIES MagnumFontTestLib ${GL_TEST_LIBRARIES}) diff --git a/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp b/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp index 176c0ac31..2ca6675b1 100644 --- a/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp +++ b/src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp @@ -28,7 +28,7 @@ #include "Magnum/Text/GlyphCache.h" #include "MagnumPlugins/MagnumFont/MagnumFont.h" -#include "magnumFontTestConfigure.h" +#include "configure.h" namespace Magnum { namespace Text { namespace Test { diff --git a/src/MagnumPlugins/MagnumFont/Test/magnumFontTestConfigure.h.cmake b/src/MagnumPlugins/MagnumFont/Test/configure.h.cmake similarity index 100% rename from src/MagnumPlugins/MagnumFont/Test/magnumFontTestConfigure.h.cmake rename to src/MagnumPlugins/MagnumFont/Test/configure.h.cmake diff --git a/src/MagnumPlugins/MagnumFont/pluginRegistrationMagnumFont.cpp b/src/MagnumPlugins/MagnumFont/pluginRegistration.cpp similarity index 100% rename from src/MagnumPlugins/MagnumFont/pluginRegistrationMagnumFont.cpp rename to src/MagnumPlugins/MagnumFont/pluginRegistration.cpp diff --git a/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt b/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt index 5f590b7e8..50bbd169c 100644 --- a/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt +++ b/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt @@ -34,7 +34,7 @@ set_target_properties(MagnumFontConverterObjects PROPERTIES COMPILE_FLAGS "${CMA add_plugin(MagnumFontConverter ${MAGNUM_PLUGINS_FONTCONVERTER_INSTALL_DIR} MagnumFontConverter.conf $ - pluginRegistrationMagnumFontConverter.cpp) + pluginRegistration.cpp) target_link_libraries(MagnumFontConverter Magnum MagnumText) if(WIN32) diff --git a/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt b/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt index 6ca4fda60..7525fb99b 100644 --- a/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt @@ -22,11 +22,10 @@ # DEALINGS IN THE SOFTWARE. # -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/magnumFontConverterTestConfigure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/magnumFontConverterTestConfigure.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake + ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}/../../MagnumFont/Test/ - ${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(MagnumFontConverterGLTest MagnumFontConverterGLTest.cpp LIBRARIES MagnumFontConverterTestLib diff --git a/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp index baf60b0f9..152f05d21 100644 --- a/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp +++ b/src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp @@ -35,8 +35,8 @@ #include "MagnumPlugins/MagnumFontConverter/MagnumFontConverter.h" #include "MagnumPlugins/TgaImporter/TgaImporter.h" -#include "magnumFontTestConfigure.h" -#include "magnumFontConverterTestConfigure.h" +#include "../../MagnumFont/Test/configure.h" +#include "configure.h" namespace Magnum { namespace Text { namespace Test { diff --git a/src/MagnumPlugins/MagnumFontConverter/Test/magnumFontConverterTestConfigure.h.cmake b/src/MagnumPlugins/MagnumFontConverter/Test/configure.h.cmake similarity index 100% rename from src/MagnumPlugins/MagnumFontConverter/Test/magnumFontConverterTestConfigure.h.cmake rename to src/MagnumPlugins/MagnumFontConverter/Test/configure.h.cmake diff --git a/src/MagnumPlugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp b/src/MagnumPlugins/MagnumFontConverter/pluginRegistration.cpp similarity index 100% rename from src/MagnumPlugins/MagnumFontConverter/pluginRegistrationMagnumFontConverter.cpp rename to src/MagnumPlugins/MagnumFontConverter/pluginRegistration.cpp diff --git a/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt b/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt index 1efdd806e..c374a2bdf 100644 --- a/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt +++ b/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt @@ -34,7 +34,7 @@ set_target_properties(TgaImageConverterObjects PROPERTIES COMPILE_FLAGS "-DTgaIm add_plugin(TgaImageConverter ${MAGNUM_PLUGINS_IMAGECONVERTER_INSTALL_DIR} TgaImageConverter.conf $ - pluginRegistrationTgaImageConverter.cpp) + pluginRegistration.cpp) target_link_libraries(TgaImageConverter Magnum) install(FILES ${TgaImageConverter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImageConverter) diff --git a/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt b/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt index f1c56f698..874dff234 100644 --- a/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt @@ -25,6 +25,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(TgaImageConverterTest TgaImageConverterTest.cpp LIBRARIES TgaImageConverterTestLib TgaImporterTestLib) diff --git a/src/MagnumPlugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp b/src/MagnumPlugins/TgaImageConverter/pluginRegistration.cpp similarity index 100% rename from src/MagnumPlugins/TgaImageConverter/pluginRegistrationTgaImageConverter.cpp rename to src/MagnumPlugins/TgaImageConverter/pluginRegistration.cpp diff --git a/src/MagnumPlugins/TgaImporter/CMakeLists.txt b/src/MagnumPlugins/TgaImporter/CMakeLists.txt index 2f893e5f0..1df89a098 100644 --- a/src/MagnumPlugins/TgaImporter/CMakeLists.txt +++ b/src/MagnumPlugins/TgaImporter/CMakeLists.txt @@ -35,7 +35,7 @@ set_target_properties(TgaImporterObjects PROPERTIES COMPILE_FLAGS "-DTgaImporter add_plugin(TgaImporter ${MAGNUM_PLUGINS_IMPORTER_INSTALL_DIR} TgaImporter.conf $ - pluginRegistrationTgaImporter.cpp) + pluginRegistration.cpp) target_link_libraries(TgaImporter Magnum) install(FILES ${TgaImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImporter) diff --git a/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt b/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt index 3e825ad47..cc9dbc3fc 100644 --- a/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt @@ -25,6 +25,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(TgaImporterTest TgaImporterTest.cpp LIBRARIES TgaImporterTestLib) diff --git a/src/MagnumPlugins/TgaImporter/pluginRegistrationTgaImporter.cpp b/src/MagnumPlugins/TgaImporter/pluginRegistration.cpp similarity index 100% rename from src/MagnumPlugins/TgaImporter/pluginRegistrationTgaImporter.cpp rename to src/MagnumPlugins/TgaImporter/pluginRegistration.cpp diff --git a/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt index a1a406d74..b55568489 100644 --- a/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt +++ b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt @@ -39,7 +39,7 @@ set_target_properties(WavAudioImporterObjects PROPERTIES COMPILE_FLAGS "-DWavAud add_plugin(WavAudioImporter ${MAGNUM_PLUGINS_AUDIOIMPORTER_INSTALL_DIR} WavAudioImporter.conf $ - pluginRegistrationWavAudioImporter.cpp) + pluginRegistration.cpp) target_link_libraries(WavAudioImporter Magnum MagnumAudio) install(FILES ${WavAudioImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/WavAudioImporter) diff --git a/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt b/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt index fda7c7e61..bf72a385b 100644 --- a/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt +++ b/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt @@ -25,6 +25,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/configure.h) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) corrade_add_test(WavAudioImporterTest WavImporterTest.cpp LIBRARIES WavAudioImporterTestLib) diff --git a/src/MagnumPlugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp b/src/MagnumPlugins/WavAudioImporter/pluginRegistration.cpp similarity index 100% rename from src/MagnumPlugins/WavAudioImporter/pluginRegistrationWavAudioImporter.cpp rename to src/MagnumPlugins/WavAudioImporter/pluginRegistration.cpp