diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/cmake/00-Common.cmake | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/cmake/00-Common.cmake')
| -rw-r--r-- | linden/indra/cmake/00-Common.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 81bfbdf..ea21ba0 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake | |||
| @@ -24,6 +24,11 @@ list(REMOVE_DUPLICATES TYPES) | |||
| 24 | set(CMAKE_CONFIGURATION_TYPES ${TYPES} CACHE STRING "Supported build types." FORCE) | 24 | set(CMAKE_CONFIGURATION_TYPES ${TYPES} CACHE STRING "Supported build types." FORCE) |
| 25 | unset(TYPES) | 25 | unset(TYPES) |
| 26 | 26 | ||
| 27 | # Work around nmake / VS difference. | ||
| 28 | set(VIEWER_CFG_INTDIR ${CMAKE_CFG_INTDIR}) | ||
| 29 | if (NMAKE) | ||
| 30 | set(VIEWER_CFG_INTDIR ${CMAKE_BUILD_TYPE}) | ||
| 31 | endif(NMAKE) | ||
| 27 | 32 | ||
| 28 | # Determine the number of bits of this processor | 33 | # Determine the number of bits of this processor |
| 29 | 34 | ||