diff --git a/doc/generated/CMakeLists.txt b/doc/generated/CMakeLists.txt index 21cb405c5..e4eaf8626 100644 --- a/doc/generated/CMakeLists.txt +++ b/doc/generated/CMakeLists.txt @@ -46,11 +46,7 @@ else() message(FATAL_ERROR "No windowless application available on this platform") endif() -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/configure.h) - add_executable(shaders shaders.cpp) -target_include_directories(shaders PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(shaders Magnum::Magnum Magnum::MeshTools @@ -59,7 +55,6 @@ target_link_libraries(shaders Magnum::WindowlessApplication) add_executable(primitives primitives.cpp) -target_include_directories(primitives PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) target_link_libraries(primitives Magnum::Magnum Magnum::MeshTools diff --git a/doc/generated/configure.h.cmake b/doc/generated/configure.h.cmake deleted file mode 100644 index 8da04ca18..000000000 --- a/doc/generated/configure.h.cmake +++ /dev/null @@ -1,32 +0,0 @@ -/* - This file is part of Magnum. - - Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 - Vladimír Vondruš - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -#ifdef CORRADE_IS_DEBUG_BUILD -#define MAGNUM_PLUGINS_IMAGECONVERTER_DIR "${MAGNUM_PLUGINS_IMAGECONVERTER_DEBUG_DIR}" -#define MAGNUM_PLUGINS_IMPORTER_DIR "${MAGNUM_PLUGINS_IMPORTER_DEBUG_DIR}" -#else -#define MAGNUM_PLUGINS_IMAGECONVERTER_DIR "${MAGNUM_PLUGINS_IMAGECONVERTER_DIR}" -#define MAGNUM_PLUGINS_IMPORTER_DIR "${MAGNUM_PLUGINS_IMPORTER_DIR}" -#endif diff --git a/doc/generated/primitives.cpp b/doc/generated/primitives.cpp index a0e191cab..bc47c9a81 100644 --- a/doc/generated/primitives.cpp +++ b/doc/generated/primitives.cpp @@ -72,8 +72,6 @@ #include #include -#include "configure.h" - using namespace Magnum; using namespace Magnum::Math::Literals; @@ -130,7 +128,7 @@ namespace { } int PrimitiveVisualizer::exec() { - PluginManager::Manager converterManager{MAGNUM_PLUGINS_IMAGECONVERTER_DIR}; + PluginManager::Manager converterManager; std::unique_ptr converter = converterManager.loadAndInstantiate("PngImageConverter"); if(!converter) { Error() << "Cannot load image converter plugin"; diff --git a/doc/generated/shaders.cpp b/doc/generated/shaders.cpp index 2e9445934..22931a468 100644 --- a/doc/generated/shaders.cpp +++ b/doc/generated/shaders.cpp @@ -64,8 +64,6 @@ #include #include -#include "configure.h" - using namespace Magnum; using namespace Magnum::Math::Literals; @@ -90,14 +88,14 @@ namespace { } int ShaderVisualizer::exec() { - PluginManager::Manager converterManager{MAGNUM_PLUGINS_IMAGECONVERTER_DIR}; + PluginManager::Manager converterManager; std::unique_ptr converter = converterManager.loadAndInstantiate("PngImageConverter"); if(!converter) { Error() << "Cannot load image converter plugin"; std::exit(1); } - PluginManager::Manager importerManager{MAGNUM_PLUGINS_IMPORTER_DIR}; + PluginManager::Manager importerManager; _importer = importerManager.loadAndInstantiate("PngImporter"); if(!_importer) { Error() << "Cannot load image importer plugin";