From: Josh <jrosenba@cisco.com>
Date: Tue, 2 Dec 2014 18:11:35 +0000 (-0600)
Subject: another cpack tweak.  Autotools finally working as expected
X-Git-Tag: 3.0.0-233~1143^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72d586ca94a0809e0137dab5796696f86b154de2;p=thirdparty%2Fsnort3.git

another cpack tweak.  Autotools finally working as expected
---

diff --git a/cmake/copy_symlinks.cmake b/cmake/copy_symlinks.cmake
deleted file mode 100644
index 49db2c52c..000000000
--- a/cmake/copy_symlinks.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-if (NOT SOURCE_DIRECTORY)
-    message (FATAL_ERROR "SOURCE_DIRECTORY must be defined")
-
-else()
-    set (link_dir "${SOURCE_DIRECTORY}/tmp")
-    execute_process ( COMMAND ${CMAKE_COMMAND} -E make_directory "${link_dir}")
-
-
-    file (GLOB ALL_FILES RELATIVE ${SOURCE_DIRECTORY} "*")
-
-    foreach (f ${ALL_FILES})
-        if ( IS_SYMLINK ${f} )
-
-            #  This two step copy process is necessary to ensure the binary
-            #  is copied rather than the symlink.  So, the first 'copy'
-            #  command ensure the binary has a newer timestamp than
-            #  the symlink (cmake won't copy if the two files have
-            #  the same timestamp).  The second copy will overwrite
-            #  the original symlink.
-
-            execute_process ( COMMAND ${CMAKE_COMMAND} -E copy "${f}" "${link_dir}/${f}" )
-            execute_process ( COMMAND ${CMAKE_COMMAND} -E copy "${link_dir}/${f}" "${f}" )
-        endif ( IS_SYMLINK ${f} )
-    endforeach(f)
-
-    execute_process ( COMMAND ${CMAKE_COMMAND} -E remove_directory "${link_dir}")
-endif()
diff --git a/cmake/packaging_data.cmake b/cmake/packaging_data.cmake
index c4948f6e0..27d16aff8 100644
--- a/cmake/packaging_data.cmake
+++ b/cmake/packaging_data.cmake
@@ -12,28 +12,9 @@ add_custom_target( autotools_symlinks
     COMMENT "recreating autotools symlinks"
 )
 
-add_custom_target( copy_symlinks
-    COMMAND
-        ${CMAKE_COMMAND} -DSOURCE_DIRECTORY=${CMAKE_SOURCE_DIR}
-        -P ${CMAKE_CURRENT_LIST_DIR}/copy_symlinks.cmake
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    COMMENT "converting top level symlinks to binaries"
-)
-
-add_custom_target( copy_m4_symlinks
-    COMMAND
-        ${CMAKE_COMMAND}
-        -DSOURCE_DIRECTORY=${CMAKE_SOURCE_DIR}/m4
-        -P ${CMAKE_CURRENT_LIST_DIR}/copy_symlinks.cmake
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/m4
-    COMMENT "converting m4 symlinks to binaries"
-)
-
 add_custom_target( dist
     COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target copy_manuals_to_source
     COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target autotools_binaries
-#    COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target copy_symlinks
-#    COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target copy_m4_symlinks
     COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target package_source
     COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target delete_manuals_in_source
     COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target autotools_symlinks  # recreate autotool links.