Fixed: WITH_CEGUI changed to WITH_NEL_CEGUI but wasn't corrected in the build tree. It is now.

hg/feature/sound
"Matt Raykowski" 14 years ago
parent da4281e176
commit fb75c46b0e

@ -260,14 +260,14 @@ IF(WIN32)
ENDIF(NOT CMAKE_BUILD_TYPE STREQUAL "Release") ENDIF(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
# Install CEGUI and its dependencies. # Install CEGUI and its dependencies.
IF(WITH_CEGUI) IF(WITH_NEL_CEGUI)
INSTALL(FILES "${CEGUI_LIB_DIR}/CEGUIBase.dll" DESTINATION bin) INSTALL(FILES "${CEGUI_LIB_DIR}/CEGUIBase.dll" DESTINATION bin)
INSTALL(FILES "${CEGUI_LIB_DIR}/CEGUIDevilImageCodec.dll" DESTINATION bin) INSTALL(FILES "${CEGUI_LIB_DIR}/CEGUIDevilImageCodec.dll" DESTINATION bin)
INSTALL(FILES "${CEGUI_LIB_DIR}/CEGUIExpatParser.dll" DESTINATION bin) INSTALL(FILES "${CEGUI_LIB_DIR}/CEGUIExpatParser.dll" DESTINATION bin)
INSTALL(FILES "${CEGUI_LIB_DIR}/CEGUIFalagardWRBase.dll" DESTINATION bin) INSTALL(FILES "${CEGUI_LIB_DIR}/CEGUIFalagardWRBase.dll" DESTINATION bin)
INSTALL(FILES "${CEGUI_LIB_DIR}/Devil.dll" DESTINATION bin) INSTALL(FILES "${CEGUI_LIB_DIR}/Devil.dll" DESTINATION bin)
INSTALL(FILES "${CEGUI_LIB_DIR}/ILU.dll" DESTINATION bin) INSTALL(FILES "${CEGUI_LIB_DIR}/ILU.dll" DESTINATION bin)
ENDIF(WITH_CEGUI) ENDIF(WITH_NEL_CEGUI)
# Only the tools require MFC. # Only the tools require MFC.
IF(WITH_TOOLS) IF(WITH_TOOLS)

@ -32,9 +32,9 @@ IF(WITH_3D)
ENDIF(NOT WIN32) ENDIF(NOT WIN32)
ENDIF(WITH_DRIVER_OPENGL) ENDIF(WITH_DRIVER_OPENGL)
IF(WITH_CEGUI) IF(WITH_NEL_CEGUI)
FIND_PACKAGE(CEGUI) FIND_PACKAGE(CEGUI)
ENDIF(WITH_CEGUI) ENDIF(WITH_NEL_CEGUI)
ENDIF(WITH_3D) ENDIF(WITH_3D)

@ -28,6 +28,6 @@ IF(WITH_PACS)
SUBDIRS(pacs) SUBDIRS(pacs)
ENDIF(WITH_PACS) ENDIF(WITH_PACS)
IF(WITH_CEGUI) IF(WITH_NEL_CEGUI)
SUBDIRS(cegui) SUBDIRS(cegui)
ENDIF(WITH_CEGUI) ENDIF(WITH_NEL_CEGUI)

@ -2,9 +2,9 @@ ADD_SUBDIRECTORY(font)
ADD_SUBDIRECTORY(cluster_viewer) ADD_SUBDIRECTORY(cluster_viewer)
ADD_SUBDIRECTORY(shape_viewer) ADD_SUBDIRECTORY(shape_viewer)
IF(WITH_CEGUI) IF(WITH_NEL_CEGUI)
ADD_SUBDIRECTORY(cegui) ADD_SUBDIRECTORY(cegui)
ENDIF(WITH_CEGUI) ENDIF(WITH_NEL_CEGUI)
#IF(WITH_QT) #IF(WITH_QT)
# ADD_SUBDIRECTORY(qtnel) # ADD_SUBDIRECTORY(qtnel)

@ -24,9 +24,9 @@ IF(WITH_SOUND)
ADD_SUBDIRECTORY(sound) ADD_SUBDIRECTORY(sound)
ENDIF(WITH_SOUND) ENDIF(WITH_SOUND)
IF(WITH_CEGUI) IF(WITH_NEL_CEGUI)
ADD_SUBDIRECTORY(cegui) ADD_SUBDIRECTORY(cegui)
ENDIF(WITH_CEGUI) ENDIF(WITH_NEL_CEGUI)
IF(WITH_PACS) IF(WITH_PACS)
ADD_SUBDIRECTORY(pacs) ADD_SUBDIRECTORY(pacs)

Loading…
Cancel
Save