Merge branch 'hackathonjune2012-brad' into hackathonjune2012-brad-gtm_destdir

CMakeLists.txt

@@ -303,46 +303,29 @@ set_target_properties(maskpass PROPERTIES
   )
 install(TARGETS maskpass DESTINATION ${GTM_INSTALL_DIR}/plugin/gtmcrypt)
 
-# these files need to end up in ${GTM_INSTALL_DIR}/plugin/gtmcrypt/source.tar
-set(gtmcrypt_source_tar
-  gtmcrypt_ref.c
-  gtmcrypt_ref.h
-  gtmcrypt_interface.h
-  gtmxc_types.h
-  maskpass.c
-  gtmcrypt_dbk_ref.c
-  gtmcrypt_dbk_ref.h
-  gtmcrypt_pk_ref.c
-  gtmcrypt_pk_ref.h
-  gtmcrypt_sym_ref.h
-  install.sh
-  build.sh
-  pinentry.m
-  )
-foreach(f ${gtmcrypt_source_tar})
-  list(APPEND gtmcrypt_source_tar_depends ${GTM_SOURCE_DIR}/sr_unix/${f})
-endforeach()
-add_custom_command(
-  OUTPUT plugin/gtmcrypt/source.tar
-  DEPENDS ${gtmcrypt_source_tar_depends}
-  COMMAND tar cf ${GTM_BINARY_DIR}/plugin/gtmcrypt/source.tar ${gtmcrypt_source_tar}
-  WORKING_DIRECTORY ${GTM_SOURCE_DIR}/sr_unix
-  VERBATIM
-  )
-list(APPEND files_to_place plugin/gtmcrypt/source.tar)
-install(FILES ${GTM_BINARY_DIR}/plugin/gtmcrypt/source.tar
-  DESTINATION ${GTM_INSTALL_DIR}/plugin/gtmcrypt)
-
 foreach(f
     add_db_key.sh
+    build.sh
     encrypt_sign_db_key.sh
     gen_keypair.sh
     gen_sym_hash.sh
     gen_sym_key.sh
     gtmcrypt.tab
+    gtmcrypt_dbk_ref.c
+    gtmcrypt_dbk_ref.h
+    gtmcrypt_interface.h
+    gtmcrypt_pk_ref.c
+    gtmcrypt_pk_ref.h
+    gtmcrypt_ref.c
+    gtmcrypt_ref.h
+    gtmcrypt_sym_ref.h
+    gtmxc_types.h
     import_and_sign_key.sh
+    install.sh
+    maskpass.c
     pinentry-gtm.sh
     pinentry.m
+    pinentry.m
     )
   set(f_in "${GTM_SOURCE_DIR}/sr_unix/${f}")
   set(f_out "${GTM_BINARY_DIR}/plugin/gtmcrypt/${f}")
@@ -520,6 +503,7 @@ foreach(gtm_chset "" "UTF-8")
       DEPENDS ${in} ${GTM_SOURCE_DIR}/sr_unix/mumps.cmake mumps
       COMMAND ${CMAKE_COMMAND}
         -D gtm_dist=${GTM_BINARY_DIR}
+        -D gtmroutines=.
         -D gtm_chset=${gtm_chset}
         -D gtm_icu_version=${gtm_icu_version}
         -D mumps=$<TARGET_FILE:mumps>
@@ -584,6 +568,7 @@ add_custom_command(
   WORKING_DIRECTORY ${GTM_BINARY_DIR}/gen
   COMMAND ${CMAKE_COMMAND}
     -D gtm_dist=${GTM_BINARY_DIR}
+    -D gtmroutines=.
     -D mumps=$<TARGET_FILE:mumps>
     -D "args=${mumps_ttt_args}"
     -D output_file=ttt.log
@@ -607,6 +592,7 @@ foreach(msg
     WORKING_DIRECTORY ${GTM_BINARY_DIR}/gen
     COMMAND ${CMAKE_COMMAND}
       -D gtm_dist=${GTM_BINARY_DIR}
+      -D gtmroutines=.
       -D mumps=$<TARGET_FILE:mumps>
       -D "args=${mumps_msg_args}"
       -P ${GTM_SOURCE_DIR}/sr_unix/mumps.cmake

sr_unix/mumps.cmake

@@ -8,10 +8,16 @@
 #	the license, please stop and do not read further.	#
 #								#
 #################################################################
-set(ENV{gtm_dist} "${gtm_dist}")
-set(ENV{gtmroutines} ".")
-set(ENV{gtm_chset} "${gtm_chset}")
-set(ENV{gtm_icu_version} "${gtm_icu_version}")
+foreach(v
+    gtm_dist
+    gtmroutines
+    gtm_chset
+    gtm_icu_version
+    )
+  if(DEFINED ${v})
+    set("ENV{${v}}" "${${v}}")
+  endif()
+endforeach()
 if(output_file)
   set(output_file OUTPUT_FILE ${output_file})
 endif()