Browse Source

AnyImageImporter: fix linking of test on Windows.

pull/205/head
Vladimír Vondruš 11 years ago
parent
commit
12ac179402
  1. 6
      src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h
  2. 7
      src/MagnumPlugins/AnyImageImporter/Test/CMakeLists.txt

6
src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h

@ -32,12 +32,16 @@
#include <Magnum/Trade/AbstractImporter.h>
#ifndef DOXYGEN_GENERATING_OUTPUT
#ifndef MAGNUM_ANYIMAGEIMPORTER_BUILD_STATIC
#if defined(AnyImageImporter_EXPORTS) || defined(AnyImageImporterObjects_EXPORTS)
#define MAGNUM_ANYIMAGEIMPORTER_EXPORT CORRADE_VISIBILITY_EXPORT
#else
#define MAGNUM_ANYIMAGEIMPORTER_EXPORT CORRADE_VISIBILITY_IMPORT
#endif
#define MAGNUM_ANYIMAGEIMPORTER_LOCAL CORRADE_VISIBILITY_LOCAL
#else
#define MAGNUM_ANYIMAGEIMPORTER_EXPORT CORRADE_VISIBILITY_STATIC
#endif
#define MAGNUM_ANYIMAGEIMPORTER_LOCAL CORRADE_VISIBILITY_LOCAL
#endif
namespace Magnum { namespace Trade {

7
src/MagnumPlugins/AnyImageImporter/Test/CMakeLists.txt

@ -33,3 +33,10 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/configure.h)
corrade_add_test(AnyImageImporterTest Test.cpp LIBRARIES MagnumAnyImageImporterTestLib)
# On Win32 we need to avoid dllimporting TgaImporter symbols, because it would
# search for the symbols in some DLL even when they were linked statically.
# However it apparently doesn't matter that they were dllexported when building
# the static library. EH.
if(WIN32)
set_target_properties(AnyImageImporterTest PROPERTIES COMPILE_FLAGS "-DMAGNUM_ANYIMAGEIMPORTER_BUILD_STATIC")
endif()

Loading…
Cancel
Save