diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/CMakeLists.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/linden/indra/CMakeLists.txt b/linden/indra/CMakeLists.txt index d198115..8dca9d8 100644 --- a/linden/indra/CMakeLists.txt +++ b/linden/indra/CMakeLists.txt | |||
@@ -12,8 +12,8 @@ if (COMMAND cmake_policy) | |||
12 | cmake_policy(SET CMP0003 OLD) | 12 | cmake_policy(SET CMP0003 OLD) |
13 | endif (COMMAND cmake_policy) | 13 | endif (COMMAND cmake_policy) |
14 | 14 | ||
15 | set(ROOT_PROJECT_NAME "SecondLife" CACHE STRING | 15 | set(ROOT_PROJECT_NAME "Imprudence" CACHE STRING |
16 | "The root project/makefile/solution name. Defaults to SecondLife.") | 16 | "The root project/makefile/solution name. Defaults to Imprudence.") |
17 | project(${ROOT_PROJECT_NAME}) | 17 | project(${ROOT_PROJECT_NAME}) |
18 | 18 | ||
19 | set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") | 19 | set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") |
@@ -50,10 +50,6 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llvfs) | |||
50 | add_subdirectory(${LIBS_OPEN_PREFIX}llwindow) | 50 | add_subdirectory(${LIBS_OPEN_PREFIX}llwindow) |
51 | add_subdirectory(${LIBS_OPEN_PREFIX}llxml) | 51 | add_subdirectory(${LIBS_OPEN_PREFIX}llxml) |
52 | 52 | ||
53 | if (EXISTS ${LIBS_CLOSED_DIR}llkdu AND NOT STANDALONE) | ||
54 | add_subdirectory(${LIBS_CLOSED_PREFIX}llkdu) | ||
55 | endif (EXISTS ${LIBS_CLOSED_DIR}llkdu AND NOT STANDALONE) | ||
56 | |||
57 | add_subdirectory(${LIBS_OPEN_PREFIX}lscript) | 53 | add_subdirectory(${LIBS_OPEN_PREFIX}lscript) |
58 | 54 | ||
59 | if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts) | 55 | if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts) |
@@ -87,7 +83,7 @@ if (VIEWER) | |||
87 | endif (LINUX) | 83 | endif (LINUX) |
88 | 84 | ||
89 | add_subdirectory(${VIEWER_PREFIX}newview) | 85 | add_subdirectory(${VIEWER_PREFIX}newview) |
90 | add_dependencies(viewer secondlife-bin) | 86 | add_dependencies(viewer imprudence-bin) |
91 | endif (VIEWER) | 87 | endif (VIEWER) |
92 | 88 | ||
93 | # Linux builds the viewer and server in 2 separate projects | 89 | # Linux builds the viewer and server in 2 separate projects |