[cmake-commits] david.cole committed CMakeLists.txt 1.88 1.90 InstallScript3.cmake NONE 1.2 InstallScript4.cmake NONE 1.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/SimpleInstall
In directory public:/mounts/ram/cvs-serv24319/SimpleInstall

Modified Files:
	CMakeLists.txt 
Added Files:
	InstallScript3.cmake InstallScript4.cmake 
Log Message:
BUG: Fix #5868 - add COMPONENT handling to the SCRIPT and CODE signatures of the INSTALL command.


--- NEW FILE: InstallScript3.cmake ---
MESSAGE("This is install script 3.")
SET(INSTALL_SCRIPT_3_DID_RUN 1)
IF(INSTALL_CODE_WITH_COMPONENT_DID_RUN)
  MESSAGE(FATAL_ERROR "Install script 3 did not run before install code with component.")
ENDIF(INSTALL_CODE_WITH_COMPONENT_DID_RUN)

IF(CMAKE_INSTALL_COMPONENT)
IF(NOT "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Development")
  MESSAGE("CMAKE_INSTALL_COMPONENT=\"${CMAKE_INSTALL_COMPONENT}\"")
  MESSAGE(FATAL_ERROR "Install script 3 should only run for \"Development\" INSTALL COMPONENT.")
ENDIF(NOT "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Development")
ENDIF(CMAKE_INSTALL_COMPONENT)

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/SimpleInstall/CMakeLists.txt,v
retrieving revision 1.88
retrieving revision 1.90
diff -u -d -r1.88 -r1.90
--- CMakeLists.txt	1 Oct 2007 19:57:34 -0000	1.88
+++ CMakeLists.txt	15 Oct 2007 11:08:15 -0000	1.90
@@ -251,14 +251,21 @@
   # Test empty directory installation.
   INSTALL(DIRECTORY DESTINATION MyTest/share/empty)
 
-  # Test user-specified install scripts.
+  # Test user-specified install scripts, with and without COMPONENT.
   INSTALL(
     SCRIPT InstallScript1.cmake
     CODE "SET(INSTALL_CODE_DID_RUN 1)"
     SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/InstallScript2.cmake
     )
+  INSTALL(
+    SCRIPT InstallScript3.cmake
+    CODE "SET(INSTALL_CODE_WITH_COMPONENT_DID_RUN 1)"
+    SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/InstallScript4.cmake
+    COMPONENT Development
+    )
   SET_DIRECTORY_PROPERTIES(PROPERTIES
-    ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_INSTALL_PREFIX}/InstallScriptOut.cmake)
+    ADDITIONAL_MAKE_CLEAN_FILES
+    "${CMAKE_INSTALL_PREFIX}/InstallScriptOut.cmake;${CMAKE_INSTALL_PREFIX}/InstallScript4Out.cmake")
 
   SET_TARGET_PROPERTIES(SimpleInstall PROPERTIES OUTPUT_NAME SimpleInstExe)
   # Disable VERSION test until it is implemented in the XCode generator.

--- NEW FILE: InstallScript4.cmake ---
MESSAGE("This is install script 4.")
IF(INSTALL_SCRIPT_3_DID_RUN)
  MESSAGE("Install script ordering works.")
ELSE(INSTALL_SCRIPT_3_DID_RUN)
  MESSAGE(FATAL_ERROR "Install script 3 did not run before install script 4.")
ENDIF(INSTALL_SCRIPT_3_DID_RUN)
IF(INSTALL_CODE_WITH_COMPONENT_DID_RUN)
  MESSAGE("Install code ordering works.")
ELSE(INSTALL_CODE_WITH_COMPONENT_DID_RUN)
  MESSAGE(FATAL_ERROR "Install script 4 did not run after install with component code.")
ENDIF(INSTALL_CODE_WITH_COMPONENT_DID_RUN)

IF(CMAKE_INSTALL_COMPONENT)
IF(NOT "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Development")
  MESSAGE("CMAKE_INSTALL_COMPONENT=\"${CMAKE_INSTALL_COMPONENT}\"")
  MESSAGE(FATAL_ERROR "Install script 4 should only run for \"Development\" INSTALL COMPONENT.")
ENDIF(NOT "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Development")
ENDIF(CMAKE_INSTALL_COMPONENT)

FILE(WRITE "${CMAKE_INSTALL_PREFIX}/MyTest/InstallScript4Out.cmake"
  "SET(CMAKE_INSTALL_SCRIPT_4_DID_RUN 1)\n"
  )