Skip to content

Commit 1e86e34

Browse files
author
Kent Knox
committed
Adding detection for boost 1.60
1 parent be56a61 commit 1e86e34

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

‎src/CMakeLists.txt

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# ########################################################################
22
# Copyright 2013 Advanced Micro Devices, Inc.
3-
#
3+
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.
66
# You may obtain a copy of the License at
7-
#
7+
#
88
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
9+
#
1010
# Unless required by applicable law or agreed to in writing, software
1111
# distributed under the License is distributed on an "AS IS" BASIS,
1212
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,33 +41,33 @@ set( OPENCL_OFFLINE_BUILD_TAHITI_KERNEL OFF)
4141
#use dynamic generated kernels
4242
# MESSAGE(STATUS "Build dynamic Hawaii kernels.")
4343
# MESSAGE(STATUS "Check OPENCL_OFFLINE_BUILD_HAWAII_KERNEL to build kernls at compile-time. This will eliminates clBuildProgram() overhead and better kernel performance with certain driver.")
44-
add_definitions(-DCLBLAS_HAWAII_DYNAMIC_KERNEL)
44+
add_definitions(-DCLBLAS_HAWAII_DYNAMIC_KERNEL)
4545
#else()
4646
# MESSAGE(STATUS "Build static Hawaii kernels.")
4747
# MESSAGE(STATUS "Uncheck OPENCL_OFFLINE_BUILD_HAWAII_KERNEL to build kernls at run-time")
48-
# MESSAGE(STATUS "Please ensure the presence of Hawaii device in the system. With certain driver/compiler flags, this might result in compile-time error.")
48+
# MESSAGE(STATUS "Please ensure the presence of Hawaii device in the system. With certain driver/compiler flags, this might result in compile-time error.")
4949
#endif( )
5050

5151
#if( NOT OPENCL_OFFLINE_BUILD_BONAIRE_KERNEL )
5252
#use dynamic generated kernels
5353
# MESSAGE(STATUS "Build dynamic Bonaire kernels.")
5454
# MESSAGE(STATUS "Check OPENCL_OFFLINE_BUILD_BONAIRE_KERNEL to build kernls at compile-time. This will eliminates clBuildProgram() overhead and better kernel performance with certain driver.")
55-
add_definitions(-DCLBLAS_BONAIRE_DYNAMIC_KERNEL)
55+
add_definitions(-DCLBLAS_BONAIRE_DYNAMIC_KERNEL)
5656
#else()
5757
# MESSAGE(STATUS "Build static Bonaire kernels.")
5858
# MESSAGE(STATUS "Uncheck OPENCL_OFFLINE_BUILD_BONAIRE_KERNEL to build kernls at run-time")
59-
# MESSAGE(STATUS "Please ensure the presence of Bonaire device in the system. With certain driver/compiler flags, this might result in compile-time error.")
59+
# MESSAGE(STATUS "Please ensure the presence of Bonaire device in the system. With certain driver/compiler flags, this might result in compile-time error.")
6060
#endif( )
6161

6262
#if( NOT OPENCL_OFFLINE_BUILD_TAHITI_KERNEL )
6363
#use dynamic generated kernels
6464
# MESSAGE(STATUS "Build dynamic Tahiti kernels.")
6565
# MESSAGE(STATUS "Check OPENCL_OFFLINE_BUILD_TAHITI_KERNEL to build kernls at compile-time. This will eliminates clBuildProgram() overhead and better kernel performance with certain driver.")
66-
add_definitions(-DCLBLAS_TAHITI_DYNAMIC_KERNEL)
66+
add_definitions(-DCLBLAS_TAHITI_DYNAMIC_KERNEL)
6767
#else( )
6868
# MESSAGE(STATUS "Build static Tahiti kernels.")
6969
# MESSAGE(STATUS "Uncheck OPENCL_OFFLINE_BUILD_TAHITI_KERNEL to build kernls at run-time")
70-
# MESSAGE(STATUS "Please ensure the presence of Tahiti device in the system. With certain driver/compiler flags, this might result in compile-time error.")
70+
# MESSAGE(STATUS "Please ensure the presence of Tahiti device in the system. With certain driver/compiler flags, this might result in compile-time error.")
7171
#endif( )
7272

7373

@@ -135,8 +135,8 @@ if(NOT CMAKE_BUILD_TYPE)
135135
FORCE)
136136
endif()
137137

138-
# These variables are meant to contain string which should be appended to the installation paths
139-
# of library and executable binaries, respectively. They are meant to be user configurable/overridable.
138+
# These variables are meant to contain string which should be appended to the installation paths
139+
# of library and executable binaries, respectively. They are meant to be user configurable/overridable.
140140
set( SUFFIX_LIB_DEFAULT "" )
141141
set( SUFFIX_BIN_DEFAULT "" )
142142

@@ -170,7 +170,7 @@ if( MSVC_IDE )
170170
endif( )
171171

172172
# add the math library for Linux
173-
if( UNIX )
173+
if( UNIX )
174174
set(MATH_LIBRARY "m")
175175
endif()
176176

@@ -220,7 +220,7 @@ if( BUILD_TEST )
220220
else()
221221
message(WARNING "Cannot find acml.h")
222222
endif()
223-
223+
224224
if( UNIX )
225225
find_library(ACML_LIBRARIES acml_mp
226226
HINTS
@@ -238,7 +238,7 @@ if( BUILD_TEST )
238238
)
239239
mark_as_advanced(_acml_mv_library)
240240
endif( )
241-
241+
242242
if(WIN32)
243243
find_library(ACML_LIBRARIES libacml_mp_dll
244244
HINTS
@@ -248,7 +248,7 @@ if( BUILD_TEST )
248248
$ENV{ACML_ROOT}/${ACML_SUBDIR}/lib
249249
)
250250
endif( )
251-
251+
252252
if( NOT ACML_LIBRARIES )
253253
message(WARNING "Cannot find libacml")
254254
endif( )
@@ -272,8 +272,8 @@ find_package( OpenCL )
272272
set( Boost_USE_MULTITHREADED ON )
273273
set( Boost_USE_STATIC_LIBS ON )
274274
set( Boost_DETAILED_FAILURE_MSG ON )
275-
set( Boost_DEBUG ON )
276-
set( Boost_ADDITIONAL_VERSIONS "1.44.0" "1.44" "1.47.0" "1.47" )
275+
# set( Boost_DEBUG ON )
276+
set( Boost_ADDITIONAL_VERSIONS "1.44.0" "1.44" "1.47.0" "1.47" "1.60.0" "1.60" )
277277

278278
find_package( Boost 1.33.0 COMPONENTS program_options )
279279
message(STATUS "Boost_PROGRAM_OPTIONS_LIBRARY: ${Boost_PROGRAM_OPTIONS_LIBRARY}")
@@ -315,7 +315,7 @@ elseif( MSVC )
315315
# CMake sets huge stack frames for windows, for whatever reason. We go with compiler default.
316316
string( REGEX REPLACE "/STACK:[0-9]+" "" CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}" )
317317
string( REGEX REPLACE "/STACK:[0-9]+" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}" )
318-
string( REGEX REPLACE "/STACK:[0-9]+" "" CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}" )
318+
string( REGEX REPLACE "/STACK:[0-9]+" "" CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}" )
319319
endif( )
320320

321321
if (WIN32)
@@ -328,13 +328,13 @@ add_definitions( -DCL_USE_DEPRECATED_OPENCL_1_1_APIS )
328328
configure_file( "${PROJECT_SOURCE_DIR}/clBLAS.version.h.in" "${PROJECT_BINARY_DIR}/include/clBLAS.version.h" )
329329

330330
# configure a header file to pass the CMake version settings to the source, and package the header files in the output archive
331-
install( FILES
332-
"clBLAS.h"
331+
install( FILES
332+
"clBLAS.h"
333333
"clAmdBlas.h"
334334
"clAmdBlas.version.h"
335335
"clBLAS-complex.h"
336336
"${PROJECT_BINARY_DIR}/include/clBLAS.version.h"
337-
DESTINATION
337+
DESTINATION
338338
"./include" )
339339

340340

@@ -359,7 +359,7 @@ if( BUILD_SAMPLE AND IS_DIRECTORY "${PROJECT_SOURCE_DIR}/samples" )
359359
add_subdirectory( samples )
360360
endif( )
361361

362-
# The build server is not supposed to build or package any of the tests; build server script will define this on the command line with
362+
# The build server is not supposed to build or package any of the tests; build server script will define this on the command line with
363363
# cmake -G "Visual Studio 10 Win64" -D BUILDSERVER:BOOL=ON ../..
364364
if( BUILD_TEST )
365365
if( IS_DIRECTORY "${PROJECT_SOURCE_DIR}/tests" )
@@ -394,7 +394,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/clBLASConfigVersion.cmake
394394
DESTINATION ${destdir})
395395

396396

397-
# The following code is setting variables to control the behavior of CPack to generate our
397+
# The following code is setting variables to control the behavior of CPack to generate our
398398
if( WIN32 )
399399
set( CPACK_SOURCE_GENERATOR "ZIP" )
400400
set( CPACK_GENERATOR "ZIP" )

0 commit comments

Comments
 (0)