Skip to content

Commit

Permalink
modules: fix issue when finding deprecated Corrade build more than once.
Browse files Browse the repository at this point in the history
The CORRADE_INCLUDE_DIR accumulated values and it was no longer possible
to open the configure.h file. Found while compiling magnum-examples on
MSVC.
  • Loading branch information
mosra committed Jan 21, 2014
1 parent 3e1e831 commit 5a220ce
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions modules/FindCorrade.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ find_library(CORRADE_TESTSUITE_LIBRARY CorradeTestSuite)
find_program(CORRADE_RC_EXECUTABLE corrade-rc)

# Include dir
find_path(CORRADE_INCLUDE_DIR
find_path(_CORRADE_INCLUDE_DIR
NAMES Corrade/PluginManager Corrade/Utility)

# CMake module dir
Expand All @@ -149,7 +149,7 @@ find_package_handle_standard_args(Corrade DEFAULT_MSG
CORRADE_INTERCONNECT_LIBRARY
CORRADE_PLUGINMANAGER_LIBRARY
CORRADE_TESTSUITE_LIBRARY
CORRADE_INCLUDE_DIR
_CORRADE_INCLUDE_DIR
CORRADE_RC_EXECUTABLE
_CORRADE_MODULE_DIR)

Expand Down Expand Up @@ -216,11 +216,14 @@ mark_as_advanced(CORRADE_UTILITY_LIBRARY
CORRADE_INTERCONNECT_LIBRARY
CORRADE_PLUGINMANAGER_LIBRARY
CORRADE_TESTSUITE_LIBRARY
_CORRADE_INCLUDE_DIR
_CORRADE_MODULE_DIR)

# Add Corrade dir to include path if this is deprecated build
if(CORRADE_BUILD_DEPRECATED)
set(CORRADE_INCLUDE_DIR ${CORRADE_INCLUDE_DIR} ${CORRADE_INCLUDE_DIR}/Corrade)
set(CORRADE_INCLUDE_DIR ${_CORRADE_INCLUDE_DIR} ${CORRADE_INCLUDE_DIR}/Corrade)
else()
set(CORRADE_INCLUDE_DIR ${_CORRADE_INCLUDE_DIR})
endif()

# Include our module dir, if we have any
Expand Down

0 comments on commit 5a220ce

Please sign in to comment.