Commit 5b271db1 authored by Hamilton, Steven P.'s avatar Hamilton, Steven P.
Browse files

Fixing up some Cuda build issues.

parent 36bd52c9

Trilinos/TPLsList.cmake

+2 −1
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ 
SET( Trilinos_TPLS_FINDMODS_CLASSIFICATIONS

  BinUtils        "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/"   SS

  MPI             "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" PS

  CUDA            "${${PROJECT_NAME}_TRIBITS_DIR}/core/std_tpls/" SS

  BLAS            "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/"   PS

  LAPACK          "${${PROJECT_NAME}_TRIBITS_DIR}/common_tpls/"   PS

  )

cmake/ProfugusAddCFlags.cmake

+4 −4
Original line number Diff line number Diff line 
##---------------------------------------------------------------------------##

## ProfugusMCAddCFlags.cmake

## ProfugusAddCFlags.cmake

## Seth R Johnson

## Thu Sep 13 14:02:49 EDT 2012

##---------------------------------------------------------------------------##
@@ -14,7 +14,7 @@ INCLUDE(CheckCCompilerFlag) 
#

# This is useful for excluding warnings in GCC without breaking older versions

# of GCC.

MACRO(PROFUGUSMC_ADD_CXX_FLAGS)

MACRO(PROFUGUS_ADD_CXX_FLAGS)

  FOREACH(THEFLAG ${ARGN})

    string(REGEX REPLACE "[^0-9a-zA-Z]" "_" FLAGNAME ${THEFLAG})

    check_cxx_compiler_flag("${THEFLAG}" PROFUGUSMC_USE_CXX_FLAG_${FLAGNAME})
@@ -29,7 +29,7 @@ ENDMACRO() 
#

# This is useful for excluding warnings in GCC without breaking older versions

# of GCC.

MACRO(PROFUGUSMC_ADD_C_FLAGS)

MACRO(PROFUGUS_ADD_C_FLAGS)

  FOREACH(THEFLAG ${ARGN})

    string(REGEX REPLACE "[^0-9a-zA-Z]" "_" FLAGNAME ${THEFLAG})

    check_c_compiler_flag("${THEFLAG}" PROFUGUSMC_USE_C_FLAG_${FLAGNAME})
@@ -40,5 +40,5 @@ MACRO(PROFUGUSMC_ADD_C_FLAGS) 
ENDMACRO()



##---------------------------------------------------------------------------##

## end of ProfugusMCAddCFlags.cmake

## end of ProfugusAddCFlags.cmake

##---------------------------------------------------------------------------##