diff options
Diffstat (limited to 'linden/indra/cmake')
-rw-r--r-- | linden/indra/cmake/00-Common.cmake | 2 | ||||
-rw-r--r-- | linden/indra/cmake/CopyWinLibs.cmake | 8 | ||||
-rw-r--r-- | linden/indra/cmake/UnixInstall.cmake | 4 | ||||
-rw-r--r-- | linden/indra/cmake/Variables.cmake | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 7e85ce0..0528f2a 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake | |||
@@ -169,7 +169,7 @@ if (LINUX) | |||
169 | endif (SERVER) | 169 | endif (SERVER) |
170 | 170 | ||
171 | if (VIEWER) | 171 | if (VIEWER) |
172 | add_definitions(-DAPPID=imprudence) | 172 | add_definitions(-DAPPID=meta-impy) |
173 | add_definitions(-fvisibility=hidden) | 173 | add_definitions(-fvisibility=hidden) |
174 | # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The viewer doesn't need to catch SIGCHLD anyway. | 174 | # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The viewer doesn't need to catch SIGCHLD anyway. |
175 | add_definitions(-DLL_IGNORE_SIGCHLD) | 175 | add_definitions(-DLL_IGNORE_SIGCHLD) |
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index f584689..b4becf7 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake | |||
@@ -1,7 +1,7 @@ | |||
1 | # -*- cmake -*- | 1 | # -*- cmake -*- |
2 | 2 | ||
3 | # The copy_win_libs folder contains file lists and a script used to | 3 | # The copy_win_libs folder contains file lists and a script used to |
4 | # copy dlls, exes and such needed to run Imprudence from within | 4 | # copy dlls, exes and such needed to run meta-impy from within |
5 | # VisualStudio. | 5 | # VisualStudio. |
6 | 6 | ||
7 | include(CMakeCopyIfDifferent) | 7 | include(CMakeCopyIfDifferent) |
@@ -282,7 +282,7 @@ if(EXISTS ${debug_msvc8_redist_path}) | |||
282 | ARGS | 282 | ARGS |
283 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py | 283 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py |
284 | ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest | 284 | ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest |
285 | ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config | 285 | ${CMAKE_CURRENT_SOURCE_DIR}/meta-impyDebug.exe.config |
286 | ${debug_appconfig_file} | 286 | ${debug_appconfig_file} |
287 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest | 287 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest |
288 | COMMENT "Creating debug app config file" | 288 | COMMENT "Creating debug app config file" |
@@ -327,7 +327,7 @@ if(EXISTS ${release_msvc8_redist_path}) | |||
327 | ARGS | 327 | ARGS |
328 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py | 328 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py |
329 | ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest | 329 | ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest |
330 | ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config | 330 | ${CMAKE_CURRENT_SOURCE_DIR}/meta-impy.exe.config |
331 | ${release_appconfig_file} | 331 | ${release_appconfig_file} |
332 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest | 332 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest |
333 | COMMENT "Creating release app config file" | 333 | COMMENT "Creating release app config file" |
@@ -340,7 +340,7 @@ if(EXISTS ${release_msvc8_redist_path}) | |||
340 | ARGS | 340 | ARGS |
341 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py | 341 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py |
342 | ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest | 342 | ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest |
343 | ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config | 343 | ${CMAKE_CURRENT_SOURCE_DIR}/meta-impy.exe.config |
344 | ${relwithdebinfo_appconfig_file} | 344 | ${relwithdebinfo_appconfig_file} |
345 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest | 345 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest |
346 | COMMENT "Creating relwithdebinfo app config file" | 346 | COMMENT "Creating relwithdebinfo app config file" |
diff --git a/linden/indra/cmake/UnixInstall.cmake b/linden/indra/cmake/UnixInstall.cmake index 0234dee..73f6714 100644 --- a/linden/indra/cmake/UnixInstall.cmake +++ b/linden/indra/cmake/UnixInstall.cmake | |||
@@ -21,11 +21,11 @@ if (INSTALL) | |||
21 | set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH | 21 | set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH |
22 | "Installation directory for read-only shared files.") | 22 | "Installation directory for read-only shared files.") |
23 | 23 | ||
24 | set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/imprudence-${viewer_VERSION} | 24 | set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/meta-impy-${viewer_VERSION} |
25 | CACHE PATH | 25 | CACHE PATH |
26 | "Installation directory for binaries.") | 26 | "Installation directory for binaries.") |
27 | 27 | ||
28 | set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/imprudence-${viewer_VERSION} | 28 | set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/meta-impy-${viewer_VERSION} |
29 | CACHE PATH | 29 | CACHE PATH |
30 | "Installation directory for read-only data files.") | 30 | "Installation directory for read-only data files.") |
31 | endif (INSTALL) | 31 | endif (INSTALL) |
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake index eb9c004..37e77ae 100644 --- a/linden/indra/cmake/Variables.cmake +++ b/linden/indra/cmake/Variables.cmake | |||
@@ -74,10 +74,10 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | |||
74 | set(GRID agni CACHE STRING "Target Grid") | 74 | set(GRID agni CACHE STRING "Target Grid") |
75 | 75 | ||
76 | set(VIEWER ON CACHE BOOL "Build Second Life viewer.") | 76 | set(VIEWER ON CACHE BOOL "Build Second Life viewer.") |
77 | set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name") | 77 | set(VIEWER_CHANNEL "meta-impy" CACHE STRING "Viewer Channel Name") |
78 | set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") | 78 | set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") |
79 | 79 | ||
80 | set(STANDALONE OFF CACHE BOOL "Do not use Imprudence-supplied prebuilt libraries.") | 80 | set(STANDALONE OFF CACHE BOOL "Do not use meta-impy-supplied prebuilt libraries.") |
81 | 81 | ||
82 | if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) | 82 | if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) |
83 | set(SERVER ON CACHE BOOL "Build Second Life server software.") | 83 | set(SERVER ON CACHE BOOL "Build Second Life server software.") |