mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-28 12:40:06 +00:00
Code Issues Projects Releases Wiki Activity

CMake fixes:

Browse Source 
- Fix environment variable in Bullet
- Remove spurious message in MyGUI
This commit is contained in:
Sylvain THESNIERES 2012-06-08 19:54:12 +02:00
parent ad54955e95
commit 7354d1eccb
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindBullet.cmake
View File

@ -19,6 +19,8 @@
# BSD license. # BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file. # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
set(BULLET_ROOT $ENV{BULLET_ROOT})
macro(_FIND_BULLET_LIBRARY _var) macro(_FIND_BULLET_LIBRARY _var)
find_library(${_var} find_library(${_var}
NAMES NAMES

6
cmake/FindMyGUI.cmake
View File

@ -22,7 +22,7 @@ IF (WIN32) #Windows
SET(MYGUISDK $ENV{MYGUI_HOME}) SET(MYGUISDK $ENV{MYGUI_HOME})
IF (MYGUISDK) IF (MYGUISDK)
findpkg_begin ( "MYGUI" ) findpkg_begin ( "MYGUI" )
MESSAGE(STATUS "Using MyGUI in OGRE SDK") MESSAGE(STATUS "Using MyGUI in MyGUI SDK")
STRING(REGEX REPLACE "[\\]" "/" MYGUISDK "${MYGUISDK}" ) STRING(REGEX REPLACE "[\\]" "/" MYGUISDK "${MYGUISDK}" )
find_path ( MYGUI_INCLUDE_DIRS find_path ( MYGUI_INCLUDE_DIRS
@ -35,7 +35,7 @@ MyGUI_OgrePlatform.h
"${MYGUISDK}/Platforms/Ogre/OgrePlatform/include" "${MYGUISDK}/Platforms/Ogre/OgrePlatform/include"
NO_DEFAULT_PATH ) NO_DEFAULT_PATH )
SET ( MYGUI_LIB_DIR ${MYGUISDK}/*/lib ) SET ( MYGUI_LIB_DIR ${MYGUISDK}/lib ${MYGUISDK}/*/lib )
find_library ( MYGUI_LIBRARIES_REL NAMES find_library ( MYGUI_LIBRARIES_REL NAMES
MyGUIEngine.lib MyGUIEngine.lib
@ -69,7 +69,7 @@ make_library_set ( MYGUI_PLATFORM_LIBRARIES )
MESSAGE ("${MYGUI_LIBRARIES}") MESSAGE ("${MYGUI_LIBRARIES}")
MESSAGE ("${MYGUI_PLATFORM_LIBRARIES}") MESSAGE ("${MYGUI_PLATFORM_LIBRARIES}")
findpkg_finish ( "MYGUI" ) #findpkg_finish ( "MYGUI" )
ENDIF (MYGUISDK) ENDIF (MYGUISDK)
IF (OGRESOURCE) IF (OGRESOURCE)