From f459adf11782484e1d2b79efe9b592985d1f2865 Mon Sep 17 00:00:00 2001 From: cc9cii Date: Sun, 12 Oct 2014 22:30:08 +1100 Subject: [PATCH] Revert CMake changes (didn't work for osx anyway) --- CMakeLists.txt | 2 +- cmake/FindOGRE.cmake | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fe5b3f086..26bfcb5e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -273,7 +273,7 @@ endif(OGRE_STATIC) include_directories("." ${OGRE_INCLUDE_DIR} ${OGRE_INCLUDE_DIR}/Ogre ${OGRE_INCLUDE_DIR}/OGRE ${OGRE_INCLUDE_DIRS} ${OGRE_PLUGIN_INCLUDE_DIRS} - ${OGRE_INCLUDE_DIR}/Ogre/Overlay ${OGRE_INCLUDE_DIR}/OGRE/Overlay ${OGRE_Overlay_INCLUDE_DIR} + ${OGRE_INCLUDE_DIR}/Overlay ${OGRE_Overlay_INCLUDE_DIR} ${SDL2_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${PLATFORM_INCLUDE_DIR} diff --git a/cmake/FindOGRE.cmake b/cmake/FindOGRE.cmake index 514b25260..24a26ccc7 100644 --- a/cmake/FindOGRE.cmake +++ b/cmake/FindOGRE.cmake @@ -364,9 +364,6 @@ macro(ogre_find_component COMPONENT HEADER) make_library_set(OGRE_${COMPONENT}_LIBRARY) findpkg_finish(OGRE_${COMPONENT}) if (OGRE_${COMPONENT}_FOUND) - if (OGRE_${COMPONENT}_INCLUDE_DIR) - set(OGRE_${COMPONENT}_INCLUDE_DIRS ${OGRE_${COMPONENT}_INCLUDE_DIR}) - endif() # find binaries if (NOT OGRE_STATIC) if (WIN32)