[clfft] 44/128: fixing install and package issues, keeping install files to minimum

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository clfft.

commit d0379cc5e1eb882cd47a0614b1a482d4305388f4
Author: bnataraj <bragadeesh.natarajan at amd.com>
Date:   Tue Aug 25 18:47:08 2015 -0500

    fixing install and package issues, keeping install files to minimum
---
 src/client/CMakeLists.txt       |  6 ------
 src/examples/CMakeLists.txt     |  1 +
 src/library/CMakeLists.txt      | 44 +++++++----------------------------------
 src/scripts/perf/CMakeLists.txt | 11 ++++++-----
 src/tests/CMakeLists.txt        | 17 ----------------
 5 files changed, 14 insertions(+), 65 deletions(-)

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index c9508f7..0d47f9b 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -52,9 +52,3 @@ if( APPLE )
     set_target_properties( clFFT-client PROPERTIES INSTALL_RPATH "@loader_path/../lib${SUFFIX_LIB}")
 endif()
 
-# CPack configuration; include the executable into the package
-install( TARGETS clFFT-client
-        RUNTIME DESTINATION bin${SUFFIX_BIN}
-        LIBRARY DESTINATION lib${SUFFIX_LIB}
-        ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
-        )
diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
index 5fd08f6..f93f0fb 100644
--- a/src/examples/CMakeLists.txt
+++ b/src/examples/CMakeLists.txt
@@ -47,6 +47,7 @@ FOREACH(FILE ${FILES})
         OUTPUT_NAME ${EXAMPLE}
         RUNTIME_OUTPUT_DIRECTORY ${DIR_NAME})
 
+    INSTALL(FILES ${FILE} DESTINATION "share/clFFT")
     INSTALL(TARGETS ${EXAMPLE_NAME}
         RUNTIME DESTINATION "bin${SUFFIX_BIN}/examples")
 ENDFOREACH()
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index e0108b7..9abf527 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -89,13 +89,13 @@ set_target_properties( clFFT PROPERTIES VERSION ${CLFFT_VERSION} )
 set_target_properties( clFFT PROPERTIES SOVERSION ${CLFFT_SOVERSION} )
 set_target_properties( clFFT PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
 
-if( CMAKE_COMPILER_IS_GNUCC )
-    configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/clFFT.pc.in
-                    ${CMAKE_CURRENT_BINARY_DIR}/clFFT.pc @ONLY )
-
-    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/clFFT.pc
-             DESTINATION lib${SUFFIX_LIB}/pkgconfig )
-endif( )
+# if( CMAKE_COMPILER_IS_GNUCC )
+#     configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/clFFT.pc.in
+#                     ${CMAKE_CURRENT_BINARY_DIR}/clFFT.pc @ONLY )
+# 
+#     install( FILES ${CMAKE_CURRENT_BINARY_DIR}/clFFT.pc
+#              DESTINATION lib${SUFFIX_LIB}/pkgconfig )
+# endif( )
 
 # CPack configuration; include the executable into the package
 install( TARGETS clFFT
@@ -105,33 +105,3 @@ install( TARGETS clFFT
         ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
         )
         
-# For debug builds, include the debug runtimes into the package for testing on non-developer machines
-set( CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP true )
-set( CMAKE_INSTALL_DEBUG_LIBRARIES true )
-set( CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY true )
-
-if( WIN32 )
-    set( CLFFT_RUNTIME_DESTINATION bin${SUFFIX_BIN} )
-else( )
-    set( CLFFT_RUNTIME_DESTINATION lib${SUFFIX_LIB} )
-endif( )
-
-include( InstallRequiredSystemLibraries )
-
-# Install necessary runtime files for debug builds
-install(    PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
-            CONFIGURATIONS Debug
-            DESTINATION ${CLFFT_RUNTIME_DESTINATION} )
-
-# Install all *.pdb files for debug builds
-install(    DIRECTORY ${PROJECT_BINARY_DIR}/staging/
-            DESTINATION ${CLFFT_RUNTIME_DESTINATION}
-            OPTIONAL
-            CONFIGURATIONS Debug
-            FILES_MATCHING PATTERN "*.pdb" )
-
-# Install a snapshot of the source as it was for this build; useful for the .pdb's
-install(    DIRECTORY ${PROJECT_SOURCE_DIR}
-            DESTINATION ${CLFFT_RUNTIME_DESTINATION}
-            OPTIONAL
-            CONFIGURATIONS Debug )
diff --git a/src/scripts/perf/CMakeLists.txt b/src/scripts/perf/CMakeLists.txt
index ca45b92..04831be 100644
--- a/src/scripts/perf/CMakeLists.txt
+++ b/src/scripts/perf/CMakeLists.txt
@@ -20,8 +20,9 @@ set(GRAPHING_SCRIPTS 	measurePerformance.py
 						errorHandler.py 
 						performanceUtility.py
 						)
-if( WIN32 )
-	install( FILES ${GRAPHING_SCRIPTS} DESTINATION bin${SUFFIX_BIN} )
-else ( )
-	install( FILES ${GRAPHING_SCRIPTS} DESTINATION share/clFFT )
-endif( )
\ No newline at end of file
+# if( WIN32 )
+# 	install( FILES ${GRAPHING_SCRIPTS} DESTINATION bin${SUFFIX_BIN} )
+# else ( )
+# 	install( FILES ${GRAPHING_SCRIPTS} DESTINATION share/clFFT )
+# endif( )
+
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 88904b5..b76353e 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -98,20 +98,3 @@ ENDIF( )
 set_target_properties( Test PROPERTIES VERSION ${CLFFT_VERSION} )
 set_target_properties( Test PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
 
-# CPack configuration; include the executable into the package
-install( TARGETS Test
-        RUNTIME DESTINATION bin${SUFFIX_BIN}
-        LIBRARY DESTINATION lib${SUFFIX_LIB}
-        ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
-        )
-
-get_target_property( testLocation Test LOCATION )
-
-configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/copyTestDependencies.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/copyTestDependencies.cmake"
-    @ONLY
-)
-
-# Register script at run at install time to analyze the executable and copy dependencies into package
-install( SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/copyTestDependencies.cmake")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git