[clfft] 03/74: enabling install and setting off default build of clients and test
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Jan 14 19:52:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/sid
in repository clfft.
commit 112a0e0f53048ce3adedaeec09a322fb7950cf67
Author: bragadeesh <bragadeesh.natarajan at amd>
Date: Mon Nov 2 21:39:49 2015 -0800
enabling install and setting off default build of clients and test
---
src/CMakeLists.txt | 6 +++---
src/callback-client/CMakeLists.txt | 28 ++++++++++++++++------------
src/client/CMakeLists.txt | 25 +++++++++++++++----------
3 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d95cc10..105571c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -67,12 +67,12 @@ endif()
# Options that the user or driver program can set to control various components of the build
option( BUILD_RUNTIME "Build the FFT runtime library" ON )
-option( BUILD_CLIENT "Build a command line clFFT client program with a variety of configurable parameters (dependency on Boost)" ON )
-option( BUILD_TEST "Build the library testing suite (dependency on google test, Boost, and FFTW)" ON )
+option( BUILD_CLIENT "Build a command line clFFT client program with a variety of configurable parameters (dependency on Boost)" OFF )
+option( BUILD_TEST "Build the library testing suite (dependency on google test, Boost, and FFTW)" OFF )
option( BUILD_LOADLIBRARIES "Build the optional dynamic load libraries that the FFT runtime will search for" ON )
option( BUILD_SHARED_LIBS "Build shared libraries." ON)
option( BUILD_EXAMPLES "Build examples." ON)
-option( BUILD_CALLBACK_CLIENT "Build a command line clFFT client program that tests callback functionality (dependency on Boost)" ON )
+option( BUILD_CALLBACK_CLIENT "Build a command line clFFT client program that tests callback functionality (dependency on Boost)" OFF )
# If BOOST_ROOT is defined as an environment value, use that value and cache it so it's visible in the cmake-gui.
# Otherwise, create a sensible default that the user can change
diff --git a/src/callback-client/CMakeLists.txt b/src/callback-client/CMakeLists.txt
index 2bc8384..3167b87 100644
--- a/src/callback-client/CMakeLists.txt
+++ b/src/callback-client/CMakeLists.txt
@@ -1,12 +1,12 @@
# ########################################################################
# Copyright 2015 Advanced Micro Devices, Inc.
-#
+#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,16 +16,16 @@
# client
-set( Client.Source callback-client.cpp
- openCL.misc.cpp
+set( Client.Source callback-client.cpp
+ openCL.misc.cpp
stdafx.cpp )
-set( Client.Headers client.h
- openCL.misc.h
+set( Client.Headers client.h
+ openCL.misc.h
../statTimer/statisticalTimer.extern.h
- ../include/unicode.compatibility.h
- ../include/stdafx.h
- ../include/targetver.h
+ ../include/unicode.compatibility.h
+ ../include/stdafx.h
+ ../include/targetver.h
../include/clFFT.h )
set( Client.Files ${Client.Source} ${Client.Headers} )
@@ -34,7 +34,7 @@ set( DL_LIB "" )
if( WIN32 )
add_definitions( "/D_CONSOLE" )
elseif( APPLE )
- set( CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++ ${CMAKE_CXX_FLAGS}" )
+ set( CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++ ${CMAKE_CXX_FLAGS}" )
else( )
# To use the dlopen() and dlclose() functions, we should link with libdl
set( DL_LIB "-ldl -lrt" )
@@ -54,4 +54,8 @@ if( APPLE )
set_target_properties( clFFT-callback-client PROPERTIES INSTALL_RPATH "@loader_path/../lib${SUFFIX_LIB}")
endif()
-
+install( TARGETS clFFT-callback-client
+ RUNTIME DESTINATION bin${SUFFIX_BIN}
+ LIBRARY DESTINATION lib${SUFFIX_LIB}
+ ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
+ )
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 0d47f9b..db54697 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -1,12 +1,12 @@
# ########################################################################
# Copyright 2013 Advanced Micro Devices, Inc.
-#
+#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,16 +16,16 @@
# client
-set( Client.Source client.cpp
- openCL.misc.cpp
+set( Client.Source client.cpp
+ openCL.misc.cpp
stdafx.cpp )
-set( Client.Headers client.h
- openCL.misc.h
+set( Client.Headers client.h
+ openCL.misc.h
../statTimer/statisticalTimer.extern.h
- ../include/unicode.compatibility.h
- ../include/stdafx.h
- ../include/targetver.h
+ ../include/unicode.compatibility.h
+ ../include/stdafx.h
+ ../include/targetver.h
../include/clFFT.h )
set( Client.Files ${Client.Source} ${Client.Headers} )
@@ -52,3 +52,8 @@ if( APPLE )
set_target_properties( clFFT-client PROPERTIES INSTALL_RPATH "@loader_path/../lib${SUFFIX_LIB}")
endif()
+install( TARGETS clFFT-client
+ RUNTIME DESTINATION bin${SUFFIX_BIN}
+ LIBRARY DESTINATION lib${SUFFIX_LIB}
+ ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
+ )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git
More information about the debian-science-commits
mailing list