forked from mirror/openmw-tes3mp
CMake fixes:
- Fix environment variable in Bullet - Remove spurious message in MyGUI
This commit is contained in:
parent
ad54955e95
commit
7354d1eccb
2 changed files with 5 additions and 3 deletions
|
@ -19,6 +19,8 @@
|
|||
# BSD license.
|
||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
|
||||
set(BULLET_ROOT $ENV{BULLET_ROOT})
|
||||
|
||||
macro(_FIND_BULLET_LIBRARY _var)
|
||||
find_library(${_var}
|
||||
NAMES
|
||||
|
|
|
@ -22,7 +22,7 @@ IF (WIN32) #Windows
|
|||
SET(MYGUISDK $ENV{MYGUI_HOME})
|
||||
IF (MYGUISDK)
|
||||
findpkg_begin ( "MYGUI" )
|
||||
MESSAGE(STATUS "Using MyGUI in OGRE SDK")
|
||||
MESSAGE(STATUS "Using MyGUI in MyGUI SDK")
|
||||
STRING(REGEX REPLACE "[\\]" "/" MYGUISDK "${MYGUISDK}" )
|
||||
|
||||
find_path ( MYGUI_INCLUDE_DIRS
|
||||
|
@ -35,7 +35,7 @@ MyGUI_OgrePlatform.h
|
|||
"${MYGUISDK}/Platforms/Ogre/OgrePlatform/include"
|
||||
NO_DEFAULT_PATH )
|
||||
|
||||
SET ( MYGUI_LIB_DIR ${MYGUISDK}/*/lib )
|
||||
SET ( MYGUI_LIB_DIR ${MYGUISDK}/lib ${MYGUISDK}/*/lib )
|
||||
|
||||
find_library ( MYGUI_LIBRARIES_REL NAMES
|
||||
MyGUIEngine.lib
|
||||
|
@ -69,7 +69,7 @@ make_library_set ( MYGUI_PLATFORM_LIBRARIES )
|
|||
MESSAGE ("${MYGUI_LIBRARIES}")
|
||||
MESSAGE ("${MYGUI_PLATFORM_LIBRARIES}")
|
||||
|
||||
findpkg_finish ( "MYGUI" )
|
||||
#findpkg_finish ( "MYGUI" )
|
||||
|
||||
ENDIF (MYGUISDK)
|
||||
IF (OGRESOURCE)
|
||||
|
|
Loading…
Reference in a new issue