From ac593a694e1a63d0d8864561465f0ff45d42a6b3 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Wed, 15 Jun 2016 23:25:21 -0400 Subject: [PATCH] Fix the cmake issue with VIEWER_CHANNEL_NOSPACES Thanks for helping, Friti! --- indra/CMakeLists.txt | 3 --- indra/cmake/Variables.cmake | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index b480efd8e..59735a520 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -14,9 +14,6 @@ set(ROOT_PROJECT_NAME "Singularity" CACHE STRING "The root project/makefile/solution name. Defaults to Singularity.") project(${ROOT_PROJECT_NAME}) -string(REPLACE " " "" VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL}) -set(VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL_NOSPACE} CACHE STRING "Prefix used for resulting artifacts.") - set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") include(Variables) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 8c4ca493e..ea904742e 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -186,6 +186,9 @@ set(GRID agni CACHE STRING "Target Grid") set(VIEWER_CHANNEL "Singularity Test" CACHE STRING "Viewer Channel Name") +string(REPLACE " " "" VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL}) +set(VIEWER_CHANNEL_NOSPACE ${VIEWER_CHANNEL_NOSPACE} CACHE STRING "Prefix used for resulting artifacts.") + set(ENABLE_SIGNING OFF CACHE BOOL "Enable signing the viewer") set(SIGNING_IDENTITY "" CACHE STRING "Specifies the signing identity to use, if necessary.")