[clfft] 53/64: Using BUILD_SHARED_LIBS as default configuration for library type
Jérôme Kieffer
kieffer-guest at moszumanska.debian.org
Wed May 20 07:33:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
kieffer-guest pushed a commit to branch develop
in repository clfft.
commit aa2056bf2eb2b6ff5efd7a0418fabf5aae7cc892
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date: Thu Mar 26 21:46:20 2015 -0400
Using BUILD_SHARED_LIBS as default configuration for library type
---
src/library/CMakeLists.txt | 6 +-----
src/statTimer/CMakeLists.txt | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index 806ec77..7f463af 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -74,11 +74,7 @@ add_definitions( "/DCLFFT_EXPORTS" )
# Include standard OpenCL headers
include_directories( ${OPENCL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/include ../include )
-if(BUILD_SHARED_LIBS)
- add_library( clFFT SHARED ${clFFT.Files} )
-else()
- add_library( clFFT STATIC ${clFFT.Files} )
-endif()
+add_library( clFFT ${clFFT.Files} )
target_link_libraries( clFFT ${OPENCL_LIBRARIES} )
set_target_properties( clFFT PROPERTIES VERSION ${CLFFT_VERSION} )
diff --git a/src/statTimer/CMakeLists.txt b/src/statTimer/CMakeLists.txt
index 09b5564..ffaed11 100644
--- a/src/statTimer/CMakeLists.txt
+++ b/src/statTimer/CMakeLists.txt
@@ -63,11 +63,7 @@ add_definitions( "/DSTATTIMER_EXPORTS" )
# Include standard OpenCL headers
include_directories( ${OPENCL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/include ../include )
-if(BUILD_SHARED_LIBS)
- add_library( StatTimer SHARED ${StatTimer.Files} )
-else()
- add_library( StatTimer STATIC ${StatTimer.Files} )
-endif()
+add_library( StatTimer ${StatTimer.Files} )
set_target_properties( StatTimer PROPERTIES VERSION ${CLFFT_VERSION} )
set_target_properties( StatTimer PROPERTIES SOVERSION ${CLFFT_SOVERSION} )
set_target_properties( StatTimer PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
--
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