remove FATAL_ERROR from install warning, and fix typos in bundling sc…

…ripts
zbanks · Nov 2, 2018 · 079c4c3 · 079c4c3
1 parent 595b8f3
commit 079c4c3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -133,7 +133,7 @@ target_link_libraries(radiance libradiance ${radiance_LIBRARIES})
 install(CODE "
  if(NOT \"${RADIANCE_SYSTEM_RESOURCES}\" STREQUAL \"${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/\")
  MESSAGE(\"For an install to work, RADIANCE_SYSTEM_RESOURCES must be set to '\\\${CMAKE_INSTALL_PREFIX}share/${PROJECT_NAME}/'\")
- MESSAGE(FATAL_ERROR \"Please recompile with cmake -DRADIANCE_SYSTEM_RESOURCES=${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/\")
+ MESSAGE(\"If your install doesn't work, recompile with cmake -DRADIANCE_SYSTEM_RESOURCES=${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/\")
  endif()
 ")
 

diff --git a/deploy/linux.sh b/deploy/linux.sh
@@ -14,7 +14,7 @@ echo "TARGZ: $TARGZ"
 echo "Qt: $QT"
 echo "Resources: $RESOURCES"
 
-if [ $RESOURCES != "resources" ]; then
+if [ $RESOURCES != "resources/" ]; then
 echo "*** ERROR ***" >&2
 echo "For a Linux bundle to work, RADIANCE_SYSTEM_RESOURCES must be set to 'resources/'" >&2
 echo "Please recompile with cmake -DRADIANCE_SYSTEM_RESOURCES=resources/" >&2

diff --git a/deploy/mac.sh b/deploy/mac.sh
@@ -14,7 +14,7 @@ echo "DMG: $DMG"
 echo "Qt: $QT"
 echo "Resources: $RESOURCES"
 
-if [ $RESOURCES != "resources" ]; then
+if [ $RESOURCES != "../Resources/" ]; then
 echo "*** ERROR ***" >&2
 echo "For a MacOS bundle to work, RADIANCE_SYSTEM_RESOURCES must be set to '../Resources/'" >&2
 echo "Please recompile with cmake -DRADIANCE_SYSTEM_RESOURCES=../Resources/" >&2