Merge branch 'tribits_github_snapshot' into 7112-atdm-ride-run-serial

cmake/tribits/core/package_arch/TribitsAddInstallGroupAndPermsFixups.cmake

@@ -1,24 +1,59 @@
 INCLUDE(Join)
 INCLUDE(TribitsFilepathHelpers)
+INCLUDE(AppendStringVarWithSep)
+
+
+FUNCTION(TRIBITS_RAISE_INSTALL_PERMS_MODS_NOT_SUPPORTED_ON_WINDOWS_ERROR)
+
+  SET(INSTALL_PERMS_SET "")
+  TRIBITS_APPEND_INSTALL_PERMS_VAR_NOT_SUPPORTED(
+    ${PROJECT_NAME}_MAKE_INSTALL_GROUP_WRITABLE)
+  TRIBITS_APPEND_INSTALL_PERMS_VAR_NOT_SUPPORTED(
+    ${PROJECT_NAME}_MAKE_INSTALL_GROUP_READABLE)
+  TRIBITS_APPEND_INSTALL_PERMS_VAR_NOT_SUPPORTED(
+    ${PROJECT_NAME}_MAKE_INSTALL_WORLD_READABLE)
+  TRIBITS_APPEND_INSTALL_PERMS_VAR_NOT_SUPPORTED(
+    ${PROJECT_NAME}_MAKE_INSTALL_GROUP)
+
+  MESSAGE(FATAL_ERROR
+    "ERROR: The options:\n"
+    "${INSTALL_PERMS_SET}"
+    "are not supported on Windows!\n"
+    "Please remove these options and configure from scratch!"
+    )
+
+ENDFUNCTION()
+
+
+# Reads and writes var INSTALL_PERMS_SET in above function
+MACRO(TRIBITS_APPEND_INSTALL_PERMS_VAR_NOT_SUPPORTED  VAR_NAME)
+  IF (NOT "${${VAR_NAME}}" STREQUAL "")
+    SET(INSTALL_PERMS_SET  "${INSTALL_PERMS_SET}    ${VAR_NAME}='${${VAR_NAME}}'\n")
+  ENDIF()
+ENDMACRO()
 
 
 FUNCTION(TRIBITS_DETERMINE_IF_SETUP_FOR_GROUP_AND_PERMS_MODIFICATIONS
   SETUP_FOR_GROUP_AND_PERMS_MODIFICATIONS_OUT
   )
 
-  IF (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    SET(setupForGroupAndPermsModifications FALSE)
-  ELSEIF(
+  IF(
     ${PROJECT_NAME}_MAKE_INSTALL_GROUP_WRITABLE OR
     ${PROJECT_NAME}_MAKE_INSTALL_GROUP_READABLE OR
     ${PROJECT_NAME}_MAKE_INSTALL_WORLD_READABLE OR
-    ${PROJECT_NAME}_MAKE_INSTALL_GROUP
+    (NOT "${${PROJECT_NAME}_MAKE_INSTALL_GROUP}" STREQUAL "")
     )
     SET(setupForGroupAndPermsModifications TRUE)
   ELSE()
     SET(setupForGroupAndPermsModifications FALSE)
   ENDIF()
 
+  IF (setupForGroupAndPermsModifications AND
+    ${PROJECT_NAME}_HOSTTYPE STREQUAL "Windows"
+    )
+    TRIBITS_RAISE_INSTALL_PERMS_MODS_NOT_SUPPORTED_ON_WINDOWS_ERROR()
+  ENDIF()
+
   SET(${SETUP_FOR_GROUP_AND_PERMS_MODIFICATIONS_OUT}
     ${setupForGroupAndPermsModifications} PARENT_SCOPE)