[clfft] 19/64: Revert "Merge branch 'develop' of https://github.com/clMathLibraries/clFFT into develop"
Jérôme Kieffer
kieffer-guest at moszumanska.debian.org
Wed May 20 07:33:33 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 930644c074fb5316c31d527c57b4450a79f2ac02
Author: bragadeesh <bragadeesh.natarajan at amd>
Date: Thu Feb 26 18:21:11 2015 -0600
Revert "Merge branch 'develop' of https://github.com/clMathLibraries/clFFT into develop"
This reverts commit 88bf9f31407ee502ee36ccd58117d3c2b13dfc7f, reversing
changes made to fba3b2b5fb316f2e98bbbaaeaa700b86559c8cf1.
---
.travis.yml | 10 +++++++++-
src/CMakeLists.txt | 22 +++++++++++++---------
src/client/CMakeLists.txt | 4 ----
src/gtest.cmake | 45 ---------------------------------------------
src/include/sharedLibrary.h | 16 +++-------------
5 files changed, 25 insertions(+), 72 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 75a1a44..afa939e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,18 @@ compiler:
before_install:
- sudo apt-get update -qq
- - sudo apt-get install -qq fglrx opencl-headers libboost-program-options-dev libfftw3-dev
+ - sudo apt-get install -qq fglrx opencl-headers libboost-program-options-dev libfftw3-dev libgtest-dev
# Uncomment below to help verify the installs above work
# - ls -la /usr/lib/libboost*
# - ls -la /usr/include/boost
+# - ls -la /usr/src/gtest
+
+install:
+ - mkdir -p bin/gTest
+ - cd bin/gTest
+ - cmake -DCMAKE_BUILD_TYPE=Release /usr/src/gtest
+ - make
+ - sudo mv libg* /usr/lib
before_script:
- cd ${TRAVIS_BUILD_DIR}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 93eb4a5..d46c193 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -115,9 +115,8 @@ set( SUFFIX_BIN_DEFAULT "" )
if( BUILD64 )
set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE )
message( STATUS "64bit build - FIND_LIBRARY_USE_LIB64_PATHS TRUE" )
- if( NOT APPLE )
- set( SUFFIX_LIB_DEFAULT "64" )
- endif()
+
+ set( SUFFIX_LIB_DEFAULT "64" )
else( )
set_property( GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE )
message( STATUS "32bit build - FIND_LIBRARY_USE_LIB64_PATHS FALSE" )
@@ -156,7 +155,17 @@ find_package( OpenCL )
# This will define FFTW_FOUND
find_package( FFTW )
-include(gtest.cmake)
+if( (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_LESS 2.8) )
+ message( STATUS "Cmake version 2.8 or greater needed to use GTest" )
+else()
+ # This will define GTEST_FOUND
+ find_package( GTest )
+
+ # Hack to get googletest v1.6 to work with vs2012
+ if( MSVC11 )
+ add_definitions( "/D_VARIADIC_MAX=10" )
+ endif( )
+endif()
# Enable building of the clACML client if both requested and all dependencies are found
if( BUILD_CLIENT AND Boost_FOUND )
@@ -178,11 +187,6 @@ get_filename_component( C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME_WE )
# message( "C_COMPILER_NAME: " ${C_COMPILER_NAME} )
# message( "CMAKE_C_COMPILER: " ${CMAKE_C_COMPILER} )
-if(APPLE)
- # avoid warning on newer cmake versions
- set(CMAKE_MACOSX_RPATH 0)
-endif()
-
# Set common compile and link options
if( MSVC )
# Following options for nMake
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 649d856..3b38b95 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -49,10 +49,6 @@ target_link_libraries( clFFT-client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES}
set_target_properties( clFFT-client PROPERTIES VERSION ${CLFFT_VERSION} )
set_target_properties( clFFT-client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
-if( APPLE )
- # properly deal with RPATH on mac
- 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
diff --git a/src/gtest.cmake b/src/gtest.cmake
deleted file mode 100644
index 512183c..0000000
--- a/src/gtest.cmake
+++ /dev/null
@@ -1,45 +0,0 @@
-
-option(USE_SYSTEM_GTEST "Use system installed gtest when set to ON, or build gtest locally when set to OFF" OFF)
-
-if(USE_SYSTEM_GTEST)
- if( (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_LESS 2.8) )
- message( STATUS "Cmake version 2.8 or greater needed to use GTest" )
- else()
- # This will define GTEST_FOUND
- find_package( GTest )
- endif()
-else()
-# find_package(Threads REQUIRED)
- include(ExternalProject)
-
- ExternalProject_Add(
- gtest-external
- URL http://googletest.googlecode.com/files/gtest-1.7.0.zip
- URL_MD5 2d6ec8ccdf5c46b05ba54a9fd1d130d7
- INSTALL_COMMAND "")
-
- ExternalProject_Get_Property(gtest-external binary_dir)
- add_library(gtest IMPORTED STATIC GLOBAL)
- set_target_properties(gtest PROPERTIES
- IMPORTED_LOCATION ${binary_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
- # IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}
- )
- add_dependencies(gtest gtest-external)
-
- add_library(gtest_main IMPORTED STATIC GLOBAL)
- set_target_properties(gtest_main PROPERTIES
- IMPORTED_LOCATION ${binary_dir}/${CMAKE_STATIC_LIBRARY_PREFIX}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}
- # IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}
- )
- add_dependencies(gtest_main gtest-external)
-
- ExternalProject_Get_Property(gtest-external source_dir)
- set(GTEST_INCLUDE_DIRS ${source_dir}/include)
- set(GTEST_LIBRARIES gtest gtest_main)
- set(GTEST_FOUND ON)
-endif()
-
-# Hack to get googletest v1.6 to work with vs2012
-if( MSVC11 )
- add_definitions( "/D_VARIADIC_MAX=10" )
-endif( )
diff --git a/src/include/sharedLibrary.h b/src/include/sharedLibrary.h
index 85a4210..e5e65de 100644
--- a/src/include/sharedLibrary.h
+++ b/src/include/sharedLibrary.h
@@ -29,31 +29,21 @@
#include <dlfcn.h>
#endif
-inline void* LoadSharedLibrary( std::string unixPrefix, std::string libraryName, bool quiet )
+inline void* LoadSharedLibrary( std::string linuxPrefix, std::string libraryName, bool quiet )
{
#if defined( _WIN32 )
libraryName += ".dll";
// HMODULE is actually the load address; function returns NULL if it cannot find the shared library
HMODULE fileHandle = ::LoadLibraryExA( libraryName.c_str( ), NULL, NULL );
-#elif defined(__linux__)
- tstring linuxName = unixPrefix;
+#else
+ tstring linuxName = linuxPrefix;
linuxName += libraryName += ".so";
void* fileHandle = ::dlopen( linuxName.c_str( ), RTLD_NOW );
if( !quiet && !fileHandle )
{
std::cerr << ::dlerror( ) << std::endl;
}
-#elif defined(__APPLE__)
- tstring appleName = unixPrefix;
- appleName += libraryName += ".dylib";
- void* fileHandle = ::dlopen( appleName.c_str( ), RTLD_NOW );
- if( !quiet && !fileHandle )
- {
- std::cerr << ::dlerror( ) << std::endl;
- }
-#else
- #error "unsupported platform""
#endif
return fileHandle;
--
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