Browse Source

AnySceneConverter: fix a misleading macro name in the test.

pull/481/head
Vladimír Vondruš 6 years ago
parent
commit
6db6a2a5f8
  1. 2
      src/MagnumPlugins/AnySceneConverter/Test/AnySceneConverterTest.cpp
  2. 4
      src/MagnumPlugins/AnySceneConverter/Test/CMakeLists.txt
  3. 2
      src/MagnumPlugins/AnySceneConverter/Test/configure.h.cmake

2
src/MagnumPlugins/AnySceneConverter/Test/AnySceneConverterTest.cpp

@ -77,7 +77,7 @@ AnySceneConverterTest::AnySceneConverterTest() {
#endif #endif
/* Create the output directory if it doesn't exist yet */ /* Create the output directory if it doesn't exist yet */
CORRADE_INTERNAL_ASSERT_OUTPUT(Utility::Directory::mkpath(ANYSCENECONVERTER_TEST_DIR)); CORRADE_INTERNAL_ASSERT_OUTPUT(Utility::Directory::mkpath(ANYSCENECONVERTER_TEST_OUTPUT_DIR));
} }
void AnySceneConverterTest::load() { void AnySceneConverterTest::load() {

4
src/MagnumPlugins/AnySceneConverter/Test/CMakeLists.txt

@ -24,9 +24,9 @@
# #
if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID) if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID)
set(ANYSCENECONVERTER_TEST_DIR "write") set(ANYSCENECONVERTER_TEST_OUTPUT_DIR "write")
else() else()
set(ANYSCENECONVERTER_TEST_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(ANYSCENECONVERTER_TEST_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
endif() endif()
# CMake before 3.8 has broken $<TARGET_FILE*> expressions for iOS (see # CMake before 3.8 has broken $<TARGET_FILE*> expressions for iOS (see

2
src/MagnumPlugins/AnySceneConverter/Test/configure.h.cmake

@ -24,4 +24,4 @@
*/ */
#cmakedefine ANYSCENECONVERTER_PLUGIN_FILENAME "${ANYSCENECONVERTER_PLUGIN_FILENAME}" #cmakedefine ANYSCENECONVERTER_PLUGIN_FILENAME "${ANYSCENECONVERTER_PLUGIN_FILENAME}"
#define ANYSCENECONVERTER_TEST_DIR "${ANYSCENECONVERTER_TEST_DIR}" #define ANYSCENECONVERTER_TEST_OUTPUT_DIR "${ANYSCENECONVERTER_TEST_OUTPUT_DIR}"

Loading…
Cancel
Save