From 842ac1061527e455cecabe533887745dd442f7f6 Mon Sep 17 00:00:00 2001 From: kumarrk Date: Fri, 2 May 2014 13:01:16 +0530 Subject: [PATCH 1/2] BenchmarkPackage correction --- benchmarkPackage/Benchmark/CMakeLists.txt | 8 ++++---- benchmarkPackage/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/benchmarkPackage/Benchmark/CMakeLists.txt b/benchmarkPackage/Benchmark/CMakeLists.txt index 18464fac..5b7be6aa 100644 --- a/benchmarkPackage/Benchmark/CMakeLists.txt +++ b/benchmarkPackage/Benchmark/CMakeLists.txt @@ -23,7 +23,8 @@ set( Bolt.Bench.Benchmark.Files ${Bolt.Bench.Benchmark.Source} ${Bolt.Bench.Benchmark.Headers} ) - +# Include headers files +include_directories( ${BOLT_INCLUDE_DIRS} ${OPENCL_INCLUDE_DIRS} ) add_executable( Bolt.Bench.Benchmark ${Bolt.Bench.Benchmark.Files} ) # Set project specific compile and link options @@ -39,12 +40,11 @@ else() endif() if(BUILD_TBB) - target_link_libraries( Bolt.Bench.Benchmark ${Boost_LIBRARIES} clBolt.Runtime ${Bolt_Link_Libs} ${TBB_LIBRARIES} ) + target_link_libraries( Bolt.Bench.Benchmark ${BOLT_LIBRARIES} ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${Bolt_Link_Libs} ${TBB_LIBRARIES} ) else (BUILD_TBB) - target_link_libraries( Bolt.Bench.Benchmark ${Boost_LIBRARIES} clBolt.Runtime ${Bolt_Link_Libs} ) + target_link_libraries( Bolt.Bench.Benchmark ${BOLT_LIBRARIES} ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${Bolt_Link_Libs} ) endif() -set_target_properties( Bolt.Bench.Benchmark PROPERTIES VERSION ${Bolt_VERSION} ) set_target_properties( Bolt.Bench.Benchmark PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" ) set_property( TARGET Bolt.Bench.Benchmark PROPERTY FOLDER "Benchmark/AMP-OpenCL") diff --git a/benchmarkPackage/CMakeLists.txt b/benchmarkPackage/CMakeLists.txt index 9bb547be..1dec4e8f 100644 --- a/benchmarkPackage/CMakeLists.txt +++ b/benchmarkPackage/CMakeLists.txt @@ -157,7 +157,7 @@ endif( ) find_package( OpenCL REQUIRED ) # Use our packaged version of Boost if not specified by the user -message("RKSKVK " $ENV{BOLT_ROOT}) + if( NOT BOOST_ROOT ) set( BOOST_ROOT "$ENV{BOLT_ROOT}" ) endif( ) From 0c4ce47cdb1bbd09d3023be0407e0bb7159446e4 Mon Sep 17 00:00:00 2001 From: rajendra Date: Thu, 17 Jul 2014 17:42:54 +0530 Subject: [PATCH 2/2] changes in the benchmarkPackage --- benchmarkPackage/CMakeLists.txt | 27 +++++++++++++++++++-------- benchmarkPackage/FindTBB.cmake | 25 +++++++++++++++++++------ 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/benchmarkPackage/CMakeLists.txt b/benchmarkPackage/CMakeLists.txt index bd0b3424..b32d3383 100644 --- a/benchmarkPackage/CMakeLists.txt +++ b/benchmarkPackage/CMakeLists.txt @@ -45,11 +45,12 @@ set_property( GLOBAL PROPERTY USE_FOLDERS TRUE ) if( MSVC_IDE ) set( Bolt_BUILD64 ${CMAKE_CL_64} ) -# set_property( GLOBAL PROPERTY USE_FOLDERS TRUE ) + set_property( GLOBAL PROPERTY USE_FOLDERS TRUE ) else() -# option( Bolt_BUILD64 "Build a 64-bit product" ON ) - set( CMAKE_BUILD_TYPE ${BOLT_BUILD_TYPE} CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE ) + option( Bolt_BUILD64 "Build a 64-bit product" ON ) + set( CMAKE_BUILD_TYPE ${BOLT_BUILD_TYPE} CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE ) endif() + message( STATUS "64bit build :" ${Bolt_BUILD64} ) message( STATUS "Build Type R/D:" ${CMAKE_BUILD_TYPE} ) @@ -104,13 +105,23 @@ elseif( (C_COMPILER_NAME STREQUAL "gcc") OR (CMAKE_COMPILER_IS_GNUCXX GREATER 0) if( Bolt_BUILD64 ) set( CMAKE_CXX_FLAGS "-m64 ${CMAKE_CXX_FLAGS}" ) set( CMAKE_C_FLAGS "-m64 ${CMAKE_C_FLAGS}" ) - set( CMAKE_EXE_LINKER_FLAGS " -m64 ${CMAKE_EXE_LINKER_FLAGS}" ) - set( CMAKE_SHARED_LINKER_FLAGS "-lpthread -m64 ${CMAKE_SHARED_LINKER_FLAGS}" ) + execute_process(COMMAND lsb_release -irc + OUTPUT_VARIABLE suse-ubuntu) + STRING(FIND $(suse_ubuntu) "Ubuntu" pos) + SET(com -1) + if($(pos) EQUAL com) + set( CMAKE_SHARED_LINKER_FLAGS "-m64 ${CMAKE_SHARED_LINKER_FLAGS}" ) + set( CMAKE_EXE_LINKER_FLAGS "-lpthread -m64 ${CMAKE_EXE_LINKER_FLAGS}" ) + else() + set( CMAKE_EXE_LINKER_FLAGS " -m64 ${CMAKE_EXE_LINKER_FLAGS}" ) + set( CMAKE_SHARED_LINKER_FLAGS "-lpthread -m64 ${CMAKE_SHARED_LINKER_FLAGS}" ) + endif() + else( ) - set( CMAKE_CXX_FLAGS "-m32 -msse2 ${CMAKE_CXX_FLAGS}" ) + set( CMAKE_CXX_FLAGS "-m32 -msse2 ${CMAKE_CXX_FLAGS}" ) set( CMAKE_C_FLAGS "-m32 -msse2 ${CMAKE_C_FLAGS}" ) - set( CMAKE_SHARED_LINKER_FLAGS "-lpthread -m32 ${CMAKE_SHARED_LINKER_FLAGS}" ) - set( CMAKE_EXE_LINKER_FLAGS " -m32 ${CMAKE_EXE_LINKER_FLAGS}" ) + set( CMAKE_SHARED_LINKER_FLAGS "-m32 ${CMAKE_SHARED_LINKER_FLAGS}" ) + set( CMAKE_EXE_LINKER_FLAGS "-lpthread -m32 ${CMAKE_EXE_LINKER_FLAGS}" ) endif( ) else( ) message( AUTHOR_WARNING "Compiler not recognized. Using default flags." ) diff --git a/benchmarkPackage/FindTBB.cmake b/benchmarkPackage/FindTBB.cmake index 1af08876..b13a2d15 100644 --- a/benchmarkPackage/FindTBB.cmake +++ b/benchmarkPackage/FindTBB.cmake @@ -90,15 +90,28 @@ else ( ) message ("TBB_INCLUDE_DIRS: " ${TBB_INCLUDE_DIRS} ) #Find TBB Libraries - set (_TBB_LIBRARY_DIR ${TBB_ROOT}/lib/${TBB_ARCH_PLATFORM} ) - find_library(TBB_LIBRARY ${_TBB_LIB_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER} + if ( MSVC ) + set (_TBB_LIBRARY_DIR ${TBB_ROOT}/lib/${TBB_ARCH_PLATFORM} ) + find_library(TBB_LIBRARY ${_TBB_LIB_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER} PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH) - find_library(TBB_MALLOC_LIBRARY ${_TBB_LIB_MALLOC_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER} + find_library(TBB_MALLOC_LIBRARY ${_TBB_LIB_MALLOC_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER} PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH) - find_library(TBB_LIBRARY_DEBUG ${_TBB_LIB_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER} + find_library(TBB_LIBRARY_DEBUG ${_TBB_LIB_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER} PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH) - find_library(TBB_MALLOC_LIBRARY_DEBUG ${_TBB_LIB_MALLOC_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER} - PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH) + find_library(TBB_MALLOC_LIBRARY_DEBUG ${_TBB_LIB_MALLOC_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER} + PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH) + else( ) + set (_TBB_LIBRARY_DIR ${TBB_ROOT}/lib/${TBB_ARCH_PLATFORM}/gcc4.4 ) + find_library(TBB_LIBRARY ${_TBB_LIB_NAME} HINTS ${_TBB_LIBRARY_DIR} + PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH) + find_library(TBB_MALLOC_LIBRARY ${_TBB_LIB_MALLOC_NAME} HINTS ${_TBB_LIBRARY_DIR} + PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH) + find_library(TBB_LIBRARY_DEBUG ${_TBB_LIB_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR} + PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH) + find_library(TBB_MALLOC_LIBRARY_DEBUG ${_TBB_LIB_MALLOC_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR} + PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH) + endif( ) + message ("TBB_LIBRARY:" ${TBB_LIBRARY}) message ("TBB_MALLOC_LIBRARY:" ${TBB_MALLOC_LIBRARY})