Browse Source

Fix test linking and static build on Windows.

I *love* this system and the amazing intricaties of dllexport/dllimport
attributes. Seventy new macros for all corner cases and ten new files
just to get this fucking thing right. It never gets old. Never. 99% of
the build system bureaucracy WOULD NOT BE NEEDED IF THAT THING HAD SANE
DESIGN LIKE EVERYWHERE ELSE. GAAAAH. AAAAAAAAARGH.
pull/205/head
Vladimír Vondruš 11 years ago
parent
commit
eff69b45b3
  1. 2
      src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h
  2. 8
      src/MagnumPlugins/AnyImageImporter/CMakeLists.txt
  3. 26
      src/MagnumPlugins/AnyImageImporter/configure.h.cmake

2
src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h

@ -31,6 +31,8 @@
#include <Magnum/Trade/AbstractImporter.h> #include <Magnum/Trade/AbstractImporter.h>
#include "MagnumPlugins/AnyImageImporter/configure.h"
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT
#ifndef MAGNUM_ANYIMAGEIMPORTER_BUILD_STATIC #ifndef MAGNUM_ANYIMAGEIMPORTER_BUILD_STATIC
#if defined(AnyImageImporter_EXPORTS) || defined(AnyImageImporterObjects_EXPORTS) #if defined(AnyImageImporter_EXPORTS) || defined(AnyImageImporterObjects_EXPORTS)

8
src/MagnumPlugins/AnyImageImporter/CMakeLists.txt

@ -23,6 +23,13 @@
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
# #
if(BUILD_STATIC)
set(MAGNUM_ANYIMAGEIMPORTER_BUILD_STATIC 1)
endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/configure.h)
set(AnyImageImporter_SRCS set(AnyImageImporter_SRCS
AnyImageImporter.cpp) AnyImageImporter.cpp)
@ -50,6 +57,7 @@ endif()
target_link_libraries(AnyImageImporter ${MAGNUM_LIBRARIES}) target_link_libraries(AnyImageImporter ${MAGNUM_LIBRARIES})
install(FILES ${AnyImageImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/AnyImageImporter) install(FILES ${AnyImageImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/AnyImageImporter)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/configure.h DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/AnyImageImporter)
if(BUILD_TESTS) if(BUILD_TESTS)
add_library(MagnumAnyImageImporterTestLib STATIC $<TARGET_OBJECTS:AnyImageImporterObjects>) add_library(MagnumAnyImageImporterTestLib STATIC $<TARGET_OBJECTS:AnyImageImporterObjects>)

26
src/MagnumPlugins/AnyImageImporter/configure.h.cmake

@ -0,0 +1,26 @@
/*
This file is part of Magnum.
Copyright © 2010, 2011, 2012, 2013, 2014, 2015
Vladimír Vondruš <mosra@centrum.cz>
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.
*/
#cmakedefine MAGNUM_ANYIMAGEIMPORTER_BUILD_STATIC
Loading…
Cancel
Save