← Back to team overview

dolfin team mailing list archive

Re: [Branch ~dolfin-core/dolfin/main] Rev 5094: Remove HINTS and stanard paths from CHOLMOD test.

 


On 24/08/10 13:09, Johannes Ring wrote:
> On Tue, Aug 24, 2010 at 1:52 PM,  <noreply@xxxxxxxxxxxxx> wrote:
>> ------------------------------------------------------------
>> revno: 5094
>> committer: Garth N. Wells <gnw20@xxxxxxxxx>
>> branch nick: dolfin-cmake
>> timestamp: Tue 2010-08-24 12:48:37 +0100
>> message:
>>  Remove HINTS and stanard paths from CHOLMOD test.
> 
> This doesn't allow me to do
> 
>   cmake -DCHOLMOD_DIR=/path/to/cholmod ..
> 
> which I like better than defining environment variables before running
> cmake. Can't we allow both?
> 

I removed 'HINTS' because the CMake docs advise against this type of
usage (they say HINTS should be used as a helper based on something else
which has been discovered, e.g. an include dir).

I expect that there's another way to point CMake in the right direction.

Garth

> Johannes
> 
>> modified:
>>  cmake/FindCHOLMOD.cmake
>>
>>
>> --
>> lp:dolfin
>> https://code.launchpad.net/~dolfin-core/dolfin/main
>>
>> Your team DOLFIN Core Team is subscribed to branch lp:dolfin.
>> To unsubscribe from this branch go to https://code.launchpad.net/~dolfin-core/dolfin/main/+edit-subscription
>>
>> === modified file 'cmake/FindCHOLMOD.cmake'
>> --- cmake/FindCHOLMOD.cmake     2010-08-24 08:58:52 +0000
>> +++ cmake/FindCHOLMOD.cmake     2010-08-24 11:48:37 +0000
>> @@ -18,41 +18,33 @@
>>
>>  # Check for header file
>>  find_path(CHOLMOD_INCLUDE_DIRS cholmod.h
>> -  HINTS ${CHOLMOD_DIR}
>> -  PATHS $ENV{CHOLMOD_DIR}
>> -  PATH_SUFFIXES include include/suitesparse include/ufsparse
>> +  PATHS $ENV{CHOLMOD_DIR}/include
>> +  PATH_SUFFIXES suitesparse ufsparse
>>   DOC "Directory where the CHOLMOD header is located"
>>  )
>>
>>  # Check for CHOLMOD library
>>  find_library(CHOLMOD_LIBRARY cholmod
>> -  HINTS ${CHOLMOD_DIR}
>> -  PATHS $ENV{CHOLMOD_DIR}
>> -  PATH_SUFFIXES lib
>> +  PATHS $ENV{CHOLMOD_DIR}/lib
>>   DOC "The CHOLMOD library"
>>   )
>>
>>  # Check for CAMD library
>>  find_library(CAMD_LIBRARY camd
>> -  HINTS ${CHOLMOD_DIR} ${CAMD_DIR}
>> -  PATHS $ENV{CHOLMOD_DIR} $ENV{CAMD_DIR}
>> +  PATHS $ENV{CHOLMOD_DIR}/lib $ENV{CAMD_DIR}/lib
>>   PATH_SUFFIXES lib
>>   DOC "The CAMD library"
>>   )
>>
>>  # Check for COLAMD library
>>  find_library(COLAMD_LIBRARY colamd
>> -  HINTS ${CHOLMOD_DIR} ${COLAMD_DIR}
>> -  PATHS $ENV{CHOLMOD_DIR} $ENV{COLAMD_DIR}
>> -  PATH_SUFFIXES lib
>> +  PATHS $ENV{CHOLMOD_DIR}/lib $ENV{COLAMD_DIR}/lib
>>   DOC "The COLAMD library"
>>   )
>>
>>  # Check for CCOLAMD library
>>  find_library(CCOLAMD_LIBRARY ccolamd
>> -  HINTS ${CHOLMOD_DIR} ${CCOLAMD_DIR}
>> -  PATHS $ENV{CHOLMOD_DIR} $ENV{CCOLAMD_DIR}
>> -  PATH_SUFFIXES lib
>> +  PATHS $ENV{CHOLMOD_DIR}/lib $ENV{CCOLAMD_DIR}/lib
>>   DOC "The CCOLAMD library"
>>   )
>>
>>
>>
>>
> 
> _______________________________________________
> Mailing list: https://launchpad.net/~dolfin
> Post to     : dolfin@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~dolfin
> More help   : https://help.launchpad.net/ListHelp




Follow ups

References