[clblas] 32/61: fix cmake bug introduced by pull request #75

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Fri Jul 24 22:49:46 UTC 2015


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

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

commit 2f845e200c33d1ba70df2744f295354072e7ae96
Author: Timmy <timmy.liu at amd.com>
Date:   Tue May 12 13:42:56 2015 -0500

    fix cmake bug introduced by pull request #75
---
 src/samples/CMakeLists.txt | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt
index 73d4882..8422e65 100644
--- a/src/samples/CMakeLists.txt
+++ b/src/samples/CMakeLists.txt
@@ -261,6 +261,11 @@ target_link_libraries(example_sasum ${OPENCL_LIBRARIES} clBLAS)
 set_property( TARGET example_sasum PROPERTY FOLDER "Samples")
 
 # CPack configuration; include the executable into the package
+if( WIN32 )
+    set( CLBLAS_EXAMPLE_INSTALL_DESTINATION bin${SUFFIX_BIN})
+else( )
+    set( CLBLAS_EXAMPLE_INSTALL_DESTINATION share/clBLAS/samples)
+endif()
 install( TARGETS example_sgemm example_sgemv example_ssymv example_ssyrk
          example_ssyr2k example_strmm example_strsm 
          example_strmv example_strsv example_sger example_cher example_ssyr 
@@ -274,18 +279,20 @@ install( TARGETS example_sgemm example_sgemv example_ssymv example_ssyrk
          example_snrm2 example_sasum example_isamax
 
          version
-        if( WIN32 )
-            RUNTIME DESTINATION bin${SUFFIX_BIN}
-        else ( )
-            RUNTIME DESTINATION share/clBLAS/samples
-        endif( )
-        LIBRARY DESTINATION lib${SUFFIX_LIB}
-        ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
+         RUNTIME DESTINATION ${CLBLAS_EXAMPLE_INSTALL_DESTINATION}
+         LIBRARY DESTINATION lib${SUFFIX_LIB}
+         ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
         )
 
 configure_file( "${PROJECT_SOURCE_DIR}/samples/CMakeLists.pack"
 		"${PROJECT_BINARY_DIR}/samples/CMakeLists.txt" COPYONLY )
 		
+if( WIN32 )
+    set( CLBLAS_SAMPLE_INSTALL_DESTINATION samples)
+else( )
+    set( CLBLAS_SAMPLE_INSTALL_DESTINATION share/clBLAS/samples/src)
+endif()
+		
 install(FILES
             example_sgemv.c
             example_ssymv.c 
@@ -336,9 +343,5 @@ install(FILES
             clBlasVersion.c
             ${PROJECT_BINARY_DIR}/samples/CMakeLists.txt
 
-            if( WIN32 )
-                DESTINATION samples
-            else ( )
-                DESTINATION share/clBLAS/samples/src
-            endif()
+            DESTINATION ${CLBLAS_SAMPLE_INSTALL_DESTINATION}
         )

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



More information about the debian-science-commits mailing list