Skip to content

Instantly share code, notes, and snippets.

@LouisBrunner
Last active December 23, 2015 12:12
Show Gist options
  • Save LouisBrunner/e10ff2f01915b0dac8e9 to your computer and use it in GitHub Desktop.
Save LouisBrunner/e10ff2f01915b0dac8e9 to your computer and use it in GitHub Desktop.
Fix compilation under Mac for CEGUI 0.8
diff --git a/cmake/FindFreeImage.cmake b/cmake/FindFreeImage.cmake
--- a/cmake/FindFreeImage.cmake
+++ b/cmake/FindFreeImage.cmake
@@ -3,14 +3,25 @@
################################################################################
include(FindPackageHandleStandardArgs)
-find_path(FREEIMAGE_H_PATH NAMES FreeImage.h)
-find_library(FREEIMAGE_LIB NAMES freeimage libfreeimage FreeImage libFreeImage PATH_SUFFIXES dynamic)
-find_library(FREEIMAGE_LIB_DBG NAMES freeimaged libfreeimaged FreeImage_d libFreeImage_d PATH_SUFFIXES dynamic)
+set(ENV_FREEIMAGE_HOME $ENV{FREEIMAGE_HOME})
+if (ENV_ZENV_FREEIMAGE_HOMEZIP_HOME)
+ string( REGEX REPLACE "\\\\" "/" ENV_FREEIMAGE_HOME ${ENV_FREEIMAGE_HOME} )
+endif ()
+
+set(FREEIMAGE_PREFIX_PATH
+ ${FREEIMAGE_HOME} ${ENV_FREEIMAGE_HOME}
+)
+
+
+set(FREEIMAGE_LIB_NAMES freeimage libfreeimage FreeImage libFreeImage)
+find_path(FREEIMAGE_H_PATH NAMES FreeImage.h PATHS ${FREEIMAGE_PREFIX_PATH} PATH_SUFFIXES include)
+find_library(FREEIMAGE_LIB NAMES ${FREEIMAGE_LIB_NAMES} PATHS ${FREEIMAGE_PREFIX_PATH} PATH_SUFFIXES dynamic lib Release lib/Release)
+find_library(FREEIMAGE_LIB_DBG NAMES ${FREEIMAGE_LIB_NAMES} freeimaged libfreeimaged FreeImage_d libFreeImage_d PATHS ${FREEIMAGE_PREFIX_PATH} PATH_SUFFIXES dynamic lib Debug lib/Debug)
mark_as_advanced(FREEIMAGE_H_PATH FREEIMAGE_LIB FREEIMAGE_LIB_DBG)
if (WIN32 OR APPLE)
- find_library(FREEIMAGE_LIB_STATIC NAMES freeimage libfreeimage FreeImage libFreeImage PATH_SUFFIXES static)
- find_library(FREEIMAGE_LIB_STATIC_DBG NAMES freeimaged libfreeimaged FreeImage_d libFreeImage_d PATH_SUFFIXES static)
+ find_library(FREEIMAGE_LIB_STATIC NAMES freeimage libfreeimage FreeImage libFreeImage PATHS ${FREEIMAGE_PREFIX_PATH} PATH_SUFFIXES static lib Release)
+ find_library(FREEIMAGE_LIB_STATIC_DBG NAMES freeimaged libfreeimaged FreeImage_d libFreeImage_d PATHS ${FREEIMAGE_PREFIX_PATH} PATH_SUFFIXES static lib Debug)
set( FREEIMAGE_DEFINITIONS_STATIC "FREEIMAGE_LIB" CACHE STRING "preprocessor definitions" )
mark_as_advanced(FREEIMAGE_DEFINITIONS_STATIC FREEIMAGE_LIB_STATIC FREEIMAGE_LIB_STATIC_DBG)
endif()
diff --git a/cmake/FindOgre.cmake b/cmake/FindOgre.cmake
--- a/cmake/FindOgre.cmake
+++ b/cmake/FindOgre.cmake
@@ -73,15 +73,26 @@
PATHS ${OGRE_PREFIX_PATH}
PATH_SUFFIXES ${OGRE_PATH_SUFFIXES})
+set(OGRE_LIB_NAME OgreMain)
+set(OGRE_LIB_DBG_NAME ${OGRE_LIB_NAME}_d)
+if (APPLE)
+ set(OGRE_LIB_NAME Ogre)
+ set(OGRE_LIB_DBG_NAME ${OGRE_LIB_NAME})
+endif ()
+
# Find the release and debug libraries.
-find_library(OGRE_LIB NAMES OgreMain
+find_library(OGRE_LIB NAMES ${OGRE_LIB_NAME}
PATHS ${OGRE_PREFIX_PATH}
PATH_SUFFIXES Release lib/Release)
-find_library(OGRE_LIB_DBG NAMES OgreMain_d
+find_library(OGRE_LIB_DBG NAMES ${OGRE_LIB_DBG_NAME}
PATHS ${OGRE_PREFIX_PATH}
PATH_SUFFIXES Debug lib/Debug)
+if (NOT OGRE_LIB AND OGRE_LIB_DBG)
+ set(OGRE_LIB ${OGRE_LIB_DBG})
+endif ()
+
mark_as_advanced(OGRE_H_PATH OGRE_H_BUILD_SETTINGS_PATH OGRE_LIB OGRE_LIB_DBG)
# If the Ogre build settings file was found, parse it to identify the Ogre Thread provider.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment