Commit adcf989e authored by Mathieu Faverge's avatar Mathieu Faverge
Browse files

Merge branch 'ordering/integers' into 'master'

Modify the integer size detection in ordering to update the size at each configuration

See merge request !6
parents 41120c39 19e081a3
......@@ -283,9 +283,11 @@ int main(int argc, char **argv) {
return 1;
}
")
unset(METIS_Idx_4 CACHE)
unset(METIS_Idx_8 CACHE)
check_c_source_runs("${METIS_C_TEST_METIS_Idx_4}" METIS_Idx_4)
check_c_source_runs("${METIS_C_TEST_METIS_Idx_8}" METIS_Idx_8)
if(NOT METIS_Idx_4)
check_c_source_runs("${METIS_C_TEST_METIS_Idx_8}" METIS_Idx_8)
if(NOT METIS_Idx_8)
set(METIS_INTSIZE -1)
else()
......
......@@ -401,9 +401,12 @@ int main(int argc, char **argv) {
return 1;
}
")
unset(PTSCOTCH_Num_4 CACHE)
unset(PTSCOTCH_Num_8 CACHE)
check_c_source_runs("${PTSCOTCH_C_TEST_SCOTCH_Num_4}" PTSCOTCH_Num_4)
check_c_source_runs("${PTSCOTCH_C_TEST_SCOTCH_Num_8}" PTSCOTCH_Num_8)
if(NOT PTSCOTCH_Num_4)
check_c_source_runs("${PTSCOTCH_C_TEST_SCOTCH_Num_8}" PTSCOTCH_Num_8)
if(NOT PTSCOTCH_Num_8)
set(PTSCOTCH_INTSIZE -1)
else()
......
......@@ -309,7 +309,7 @@ if (SCOTCH_LIBRARIES)
if (${first_lib_path} MATCHES "/lib(32|64)?$")
string(REGEX REPLACE "/lib(32|64)?$" "" not_cached_dir "${first_lib_path}")
set(SCOTCH_DIR_FOUND "${not_cached_dir}" CACHE PATH "Installation directory of SCOTCH library" FORCE)
else()
else()
set(SCOTCH_DIR_FOUND "${first_lib_path}" CACHE PATH "Installation directory of SCOTCH library" FORCE)
endif()
endif()
......@@ -345,9 +345,12 @@ int main(int argc, char **argv) {
return 1;
}
")
unset(SCOTCH_Num_4 CACHE)
unset(SCOTCH_Num_8 CACHE)
check_c_source_runs("${SCOTCH_C_TEST_SCOTCH_Num_4}" SCOTCH_Num_4)
check_c_source_runs("${SCOTCH_C_TEST_SCOTCH_Num_8}" SCOTCH_Num_8)
if(NOT SCOTCH_Num_4)
check_c_source_runs("${SCOTCH_C_TEST_SCOTCH_Num_8}" SCOTCH_Num_8)
if(NOT SCOTCH_Num_8)
set(SCOTCH_INTSIZE -1)
else()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment