[clblas] 01/05: Revert involuntary patching of source tree

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/sid
in repository clblas.

commit 5d8b82e6e40a6d8098580428bd2a4919cc9fcd33
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Oct 28 14:17:12 2015 +0000

    Revert involuntary patching of source tree
    
    This reverts commit 82e045593dc5bf3eaee58e43c44e54f781dda87c.
---
 doc/clBLAS.doxy            | 6 +++---
 src/CMakeLists.txt         | 8 ++++----
 src/library/CMakeLists.txt | 4 ----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/doc/clBLAS.doxy b/doc/clBLAS.doxy
index 03a060a..afc15ae 100644
--- a/doc/clBLAS.doxy
+++ b/doc/clBLAS.doxy
@@ -52,7 +52,7 @@ PROJECT_LOGO           =
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = 
+OUTPUT_DIRECTORY       = ..\..\bin\clBLAS.doxy
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -974,7 +974,7 @@ HTML_COLORSTYLE_GAMMA  = 80
 # page will contain the date and time when the page was generated. Setting 
 # this to NO can help when comparing the output of multiple runs.
 
-HTML_TIMESTAMP         = NO
+HTML_TIMESTAMP         = YES
 
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
 # documentation will contain sections that can be hidden and shown after the 
@@ -1223,7 +1223,7 @@ MATHJAX_FORMAT         = HTML-CSS
 # installing MathJax.  However, it is strongly recommended to install a local 
 # copy of MathJax from http://www.mathjax.org before deployment.
 
-MATHJAX_RELPATH        = /usr/share/javascript/mathjax
+MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
 
 # The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension 
 # names that should be enabled during MathJax rendering.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f05c356..a176cac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -270,7 +270,7 @@ find_package( OpenCL )
 
 # Find Boost on the system, and configure the type of boost build we want
 set( Boost_USE_MULTITHREADED ON )
-set( Boost_USE_STATIC_LIBS   OFF )
+set( Boost_USE_STATIC_LIBS   ON )
 set( Boost_DETAILED_FAILURE_MSG   ON )
 set( Boost_DEBUG ON )
 set( Boost_ADDITIONAL_VERSIONS "1.44.0" "1.44" "1.47.0" "1.47" )
@@ -296,9 +296,9 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     # Don't use -rpath.
     set(CMAKE_SKIP_RPATH ON CACHE BOOL "Skip RPATH" FORCE)
 
-    #set(CMAKE_C_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_C_FLAGS}")
-    #set(CMAKE_CXX_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_CXX_FLAGS}")
-    #set(CMAKE_Fortran_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_Fortran_FLAGS}")
+    set(CMAKE_C_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_C_FLAGS}")
+    set(CMAKE_CXX_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_CXX_FLAGS}")
+    set(CMAKE_Fortran_FLAGS "-m${TARGET_PLATFORM} ${CMAKE_Fortran_FLAGS}")
 
     if(TARGET_PLATFORM EQUAL 32)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-builtin")
diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
index 707f68e..377aa9d 100644
--- a/src/library/CMakeLists.txt
+++ b/src/library/CMakeLists.txt
@@ -868,10 +868,6 @@ set_target_properties(clBLAS PROPERTIES SOVERSION ${clBLAS_SOVERSION})
 set_target_properties( clBLAS PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
 target_link_libraries(clBLAS ${OPENCL_LIBRARIES} ${MATH_LIBRARY})
 
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
-target_link_libraries(clBLAS ${CMAKE_THREAD_LIBS_INIT})
-
 # CPack configuration; include the executable into the package
 install( TARGETS clBLAS
          EXPORT Library

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