From 5f9ae67e1b6b60e10123cc951464102eff2c2954 Mon Sep 17 00:00:00 2001 From: "Matt Raykowski\"" Date: Mon, 18 Oct 2010 10:13:01 -0500 Subject: [PATCH] Fixed: WITH_CEGUI changed to WITH_NEL_CEGUI but wasn't corrected in the build tree. It is now. --- code/CMakeLists.txt | 4 ++-- code/nel/CMakeLists.txt | 4 ++-- code/nel/include/nel/CMakeLists.txt | 4 ++-- code/nel/samples/3d/CMakeLists.txt | 4 ++-- code/nel/src/CMakeLists.txt | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 538382e5f..a504198ed 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -260,14 +260,14 @@ IF(WIN32) ENDIF(NOT CMAKE_BUILD_TYPE STREQUAL "Release") # 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}/CEGUIDevilImageCodec.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}/Devil.dll" DESTINATION bin) INSTALL(FILES "${CEGUI_LIB_DIR}/ILU.dll" DESTINATION bin) - ENDIF(WITH_CEGUI) + ENDIF(WITH_NEL_CEGUI) # Only the tools require MFC. IF(WITH_TOOLS) diff --git a/code/nel/CMakeLists.txt b/code/nel/CMakeLists.txt index bff4ab359..74c8a1902 100644 --- a/code/nel/CMakeLists.txt +++ b/code/nel/CMakeLists.txt @@ -32,9 +32,9 @@ IF(WITH_3D) ENDIF(NOT WIN32) ENDIF(WITH_DRIVER_OPENGL) - IF(WITH_CEGUI) + IF(WITH_NEL_CEGUI) FIND_PACKAGE(CEGUI) - ENDIF(WITH_CEGUI) + ENDIF(WITH_NEL_CEGUI) ENDIF(WITH_3D) diff --git a/code/nel/include/nel/CMakeLists.txt b/code/nel/include/nel/CMakeLists.txt index 0be2a83a0..9e2d5586c 100644 --- a/code/nel/include/nel/CMakeLists.txt +++ b/code/nel/include/nel/CMakeLists.txt @@ -28,6 +28,6 @@ IF(WITH_PACS) SUBDIRS(pacs) ENDIF(WITH_PACS) -IF(WITH_CEGUI) +IF(WITH_NEL_CEGUI) SUBDIRS(cegui) -ENDIF(WITH_CEGUI) +ENDIF(WITH_NEL_CEGUI) diff --git a/code/nel/samples/3d/CMakeLists.txt b/code/nel/samples/3d/CMakeLists.txt index 1abd079b2..ee038e23c 100644 --- a/code/nel/samples/3d/CMakeLists.txt +++ b/code/nel/samples/3d/CMakeLists.txt @@ -2,9 +2,9 @@ ADD_SUBDIRECTORY(font) ADD_SUBDIRECTORY(cluster_viewer) ADD_SUBDIRECTORY(shape_viewer) -IF(WITH_CEGUI) +IF(WITH_NEL_CEGUI) ADD_SUBDIRECTORY(cegui) -ENDIF(WITH_CEGUI) +ENDIF(WITH_NEL_CEGUI) #IF(WITH_QT) # ADD_SUBDIRECTORY(qtnel) diff --git a/code/nel/src/CMakeLists.txt b/code/nel/src/CMakeLists.txt index 690768531..4bf260c13 100644 --- a/code/nel/src/CMakeLists.txt +++ b/code/nel/src/CMakeLists.txt @@ -24,9 +24,9 @@ IF(WITH_SOUND) ADD_SUBDIRECTORY(sound) ENDIF(WITH_SOUND) -IF(WITH_CEGUI) +IF(WITH_NEL_CEGUI) ADD_SUBDIRECTORY(cegui) -ENDIF(WITH_CEGUI) +ENDIF(WITH_NEL_CEGUI) IF(WITH_PACS) ADD_SUBDIRECTORY(pacs)