Commit a8dd4f7b authored by PRUVOST Florent's avatar PRUVOST Florent

update morse modules

parent 174fc781
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# @copyright (c) 2009-2014 The University of Tennessee and The University # @copyright (c) 2009-2014 The University of Tennessee and The University
# of Tennessee Research Foundation. # of Tennessee Research Foundation.
# All rights reserved. # All rights reserved.
# @copyright (c) 2012-2014 Inria. All rights reserved. # @copyright (c) 2012-2016 Inria. All rights reserved.
# @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved. # @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
# #
### ###
...@@ -20,20 +20,72 @@ ...@@ -20,20 +20,72 @@
# #
# @version 0.9.0 # @version 0.9.0
# @author Xavier Lacoste # @author Xavier Lacoste
# @author Florent Pruvost
# @date 30-01-2015 # @date 30-01-2015
# #
# Define auxilary variables: # Update CMAKE auxilary variables:
# - CMAKE_C_FLAGS: C compiler flags
# - CMAKE_CXX_FLAGS: CXX compiler flags
# - CMAKE_Fortran_FLAGS: Fortran compiler flags
# - CMAKE_Fortran_PREPROCESS_FLAGS : force C preprocessor. # - CMAKE_Fortran_PREPROCESS_FLAGS : force C preprocessor.
# - CMAKE_Fortran_FREEFORM_FLAG : Force free format. # - CMAKE_Fortran_FREEFORM_FLAG : Force free format.
# - CMAKE_Fortran
### ###
if (MORSE_ENABLE_WARNING)
IF(CMAKE_Fortran_COMPILER_ID MATCHES GNU) if(CMAKE_C_COMPILER_ID MATCHES GNU)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
elseif(CMAKE_C_COMPILER_ID MATCHES Intel)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w3 -diag-disable:remark")
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES GNU)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
elseif(CMAKE_CXX_COMPILER_ID MATCHES Intel)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w3 -diag-disable:remark")
endif()
if(CMAKE_Fortran_COMPILER_ID MATCHES GNU)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall")
elseif(CMAKE_Fortran_COMPILER_ID MATCHES Intel)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -warn all -diag-disable:remark")
endif()
endif(MORSE_ENABLE_WARNING)
if (MORSE_ENABLE_COVERAGE)
if(CMAKE_C_COMPILER_ID MATCHES GNU)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage")
else()
message(FATAL_ERROR "Code coverage is only available with the GNU C (gcc)"
"\n compiler, please turn MORSE_ENABLE_COVERAGE OFF\n.")
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES GNU)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
else()
message(FATAL_ERROR "Code coverage is only available with the GNU CXX"
"\n (g++) compiler, please turn MORSE_ENABLE_COVERAGE OFF\n.")
endif()
if(CMAKE_Fortran_COMPILER_ID MATCHES GNU)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} --coverage")
else()
message(FATAL_ERROR "Code coverage is only available with the GNU"
"\n Fortran (gfortran) compiler, please turn MORSE_ENABLE_COVERAGE"
"\n OFF\n.")
endif()
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage")
endif(MORSE_ENABLE_COVERAGE)
if(CMAKE_Fortran_COMPILER_ID MATCHES GNU)
list(APPEND CMAKE_Fortran_PREPROCESS_FLAGS "-cpp") list(APPEND CMAKE_Fortran_PREPROCESS_FLAGS "-cpp")
list(APPEND CMAKE_Fortran_FREEFORM_FLAG "-ffree-form") list(APPEND CMAKE_Fortran_FREEFORM_FLAG "-ffree-form")
elseif(CMAKE_Fortran_COMPILER_ID MATCHES Intel)
ELSEIF(CMAKE_Fortran_COMPILER_ID MATCHES Intel)
list(APPEND CMAKE_Fortran_PREPROCESS_FLAG "-fpp") list(APPEND CMAKE_Fortran_PREPROCESS_FLAG "-fpp")
list(APPEND CMAKE_Fortran_FREEFORM_FLAG "") list(APPEND CMAKE_Fortran_FREEFORM_FLAG "")
ENDIF() endif()
...@@ -37,60 +37,60 @@ include(PrintFindStatus) ...@@ -37,60 +37,60 @@ include(PrintFindStatus)
function(FindHeader _libname _header_to_find) function(FindHeader _libname _header_to_find)
# save _libname upper and lower case # save _libname upper and lower case
string(TOUPPER ${_libname} LIBNAME) string(TOUPPER ${_libname} LIBNAME)
string(TOLOWER ${_libname} libname) string(TOLOWER ${_libname} libname)
# Looking for include # Looking for include
# ------------------- # -------------------
# Add system include paths to search include # Add system include paths to search include
# ------------------------------------------ # ------------------------------------------
unset(_inc_env) unset(_inc_env)
if(WIN32) if(WIN32)
string(REPLACE ":" ";" _inc_env "$ENV{INCLUDE}") string(REPLACE ":" ";" _inc_env "$ENV{INCLUDE}")
else() else()
string(REPLACE ":" ";" _path_env "$ENV{INCLUDE}") string(REPLACE ":" ";" _path_env "$ENV{INCLUDE}")
list(APPEND _inc_env "${_path_env}") list(APPEND _inc_env "${_path_env}")
string(REPLACE ":" ";" _path_env "$ENV{C_INCLUDE_PATH}") string(REPLACE ":" ";" _path_env "$ENV{C_INCLUDE_PATH}")
list(APPEND _inc_env "${_path_env}") list(APPEND _inc_env "${_path_env}")
string(REPLACE ":" ";" _path_env "$ENV{CPATH}") string(REPLACE ":" ";" _path_env "$ENV{CPATH}")
list(APPEND _inc_env "${_path_env}") list(APPEND _inc_env "${_path_env}")
string(REPLACE ":" ";" _path_env "$ENV{INCLUDE_PATH}") string(REPLACE ":" ";" _path_env "$ENV{INCLUDE_PATH}")
list(APPEND _inc_env "${_path_env}") list(APPEND _inc_env "${_path_env}")
endif() endif()
list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}") list(APPEND _inc_env "${CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES}")
list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}") list(APPEND _inc_env "${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}")
list(REMOVE_DUPLICATES _inc_env) list(REMOVE_DUPLICATES _inc_env)
# Try to find the _header_to_find in the given paths # Try to find the _header_to_find in the given paths
# -------------------------------------------------- # --------------------------------------------------
# call cmake macro to find the header path # call cmake macro to find the header path
if(${LIBNAME}_INCDIR) if(${LIBNAME}_INCDIR)
set(${LIBNAME}_${_header_to_find}_DIRS "${LIBNAME}_${_header_to_find}_DIRS-NOTFOUND") set(${LIBNAME}_${_header_to_find}_DIRS "${LIBNAME}_${_header_to_find}_DIRS-NOTFOUND")
find_path(${LIBNAME}_${_header_to_find}_DIRS find_path(${LIBNAME}_${_header_to_find}_DIRS
NAMES ${_header_to_find} NAMES ${_header_to_find}
HINTS ${${LIBNAME}_INCDIR}) HINTS ${${LIBNAME}_INCDIR})
elseif(${LIBNAME}_DIR) elseif(${LIBNAME}_DIR)
set(${LIBNAME}_${_header_to_find}_DIRS "${LIBNAME}_${_header_to_find}_DIRS-NOTFOUND") set(${LIBNAME}_${_header_to_find}_DIRS "${LIBNAME}_${_header_to_find}_DIRS-NOTFOUND")
find_path(${LIBNAME}_${_header_to_find}_DIRS find_path(${LIBNAME}_${_header_to_find}_DIRS
NAMES ${_header_to_find} NAMES ${_header_to_find}
HINTS ${${LIBNAME}_DIR} HINTS ${${LIBNAME}_DIR}
PATH_SUFFIXES include) PATH_SUFFIXES include)
else() else()
set(${LIBNAME}_${_header_to_find}_DIRS "${LIBNAME}_${_header_to_find}_DIRS-NOTFOUND") set(${LIBNAME}_${_header_to_find}_DIRS "${LIBNAME}_${_header_to_find}_DIRS-NOTFOUND")
find_path(${LIBNAME}_${_header_to_find}_DIRS find_path(${LIBNAME}_${_header_to_find}_DIRS
NAMES ${_header_to_find} NAMES ${_header_to_find}
HINTS ${_inc_env}) HINTS ${_inc_env})
endif() endif()
mark_as_advanced(${LIBNAME}_${_header_to_find}_DIRS) mark_as_advanced(${LIBNAME}_${_header_to_find}_DIRS)
# Print status if not found # Print status if not found
# ------------------------- # -------------------------
if (NOT ${LIBNAME}_${_header_to_find}_DIRS) if (NOT ${LIBNAME}_${_header_to_find}_DIRS)
Print_Find_Header_Status(${libname} ${_header_to_find}) Print_Find_Header_Status(${libname} ${_header_to_find})
endif () endif ()
endfunction(FindHeader) endfunction(FindHeader)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# @copyright (c) 2009-2014 The University of Tennessee and The University # @copyright (c) 2009-2014 The University of Tennessee and The University
# of Tennessee Research Foundation. # of Tennessee Research Foundation.
# All rights reserved. # All rights reserved.
# @copyright (c) 2012-2014 Inria. All rights reserved. # @copyright (c) 2012-2016 Inria. All rights reserved.
# @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved. # @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.
# #
### ###
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
include(CheckFunctionExists) include(CheckFunctionExists)
# To colorize messages # To colorize messages
include(ColorizeMessage) #include(ColorizeMessage)
# To find headers and libs # To find headers and libs
include(FindHeadersAndLibs) include(FindHeadersAndLibs)
...@@ -49,9 +49,11 @@ include(Ressources) ...@@ -49,9 +49,11 @@ include(Ressources)
# Add the path where we handle our FindFOO.cmake to seek for liraries # Add the path where we handle our FindFOO.cmake to seek for liraries
list(APPEND CMAKE_MODULE_PATH ${MORSE_CMAKE_MODULE_PATH}/find) list(APPEND CMAKE_MODULE_PATH ${MORSE_CMAKE_MODULE_PATH}/find)
option(MORSE_VERBOSE_FIND_PACKAGE "Add additional messages concerning no found packages" OFF) option(MORSE_ENABLE_WARNING "Enable warning messages" OFF)
#message("-- ${BoldGreen}MORSE_VERBOSE_FIND_PACKAGE is set to OFF, turn it ON to get" option(MORSE_ENABLE_COVERAGE "Enable flags for coverage test" OFF)
# "information about packages not found${ColourReset}") #option(MORSE_VERBOSE_FIND_PACKAGE "Add additional messages concerning packages not found" OFF)
#message(STATUS "MORSE_VERBOSE_FIND_PACKAGE is set to OFF, turn it ON to get"
# " information about packages not found")
## ##
## @end file MorseInit.cmake ## @end file MorseInit.cmake
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# Univ. of Tennessee, # Univ. of Tennessee,
# King Abdullah Univesity of Science and Technology # King Abdullah Univesity of Science and Technology
# Univ. of California Berkeley, # Univ. of California Berkeley,
# Univ. of Colorado Denver. # Univ. of Colorado Denver.
# #
# @version 0.9.0 # @version 0.9.0
# @author Cedric Castagnede # @author Cedric Castagnede
...@@ -27,43 +27,43 @@ ...@@ -27,43 +27,43 @@
### ###
MACRO(PARSE_ARGUMENTS prefix arg_names option_names) MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
set(DEFAULT_ARGS) set(DEFAULT_ARGS)
foreach(arg_name ${arg_names}) foreach(arg_name ${arg_names})
set(${prefix}_${arg_name}) set(${prefix}_${arg_name})
endforeach(arg_name) endforeach(arg_name)
foreach(option ${option_names}) foreach(option ${option_names})
set(${prefix}_${option} FALSE) set(${prefix}_${option} FALSE)
endforeach(option) endforeach(option)
set(current_arg_name DEFAULT_ARGS) set(current_arg_name DEFAULT_ARGS)
set(current_arg_list) set(current_arg_list)
foreach(arg ${ARGN}) foreach(arg ${ARGN})
set(larg_names ${arg_names}) set(larg_names ${arg_names})
list(FIND larg_names "${arg}" is_arg_name) list(FIND larg_names "${arg}" is_arg_name)
if(is_arg_name GREATER -1) if(is_arg_name GREATER -1)
set(${prefix}_${current_arg_name} ${current_arg_list}) set(${prefix}_${current_arg_name} ${current_arg_list})
set(current_arg_name ${arg}) set(current_arg_name ${arg})
set(current_arg_list) set(current_arg_list)
else(is_arg_name GREATER -1) else(is_arg_name GREATER -1)
set(loption_names ${option_names}) set(loption_names ${option_names})
list(FIND loption_names "${arg}" is_option) list(FIND loption_names "${arg}" is_option)
if(is_option GREATER -1) if(is_option GREATER -1)
set(${prefix}_${arg} TRUE) set(${prefix}_${arg} TRUE)
else(is_option GREATER -1) else(is_option GREATER -1)
set(current_arg_list ${current_arg_list} ${arg}) set(current_arg_list ${current_arg_list} ${arg})
endif(is_option GREATER -1) endif(is_option GREATER -1)
endif(is_arg_name GREATER -1) endif(is_arg_name GREATER -1)
endforeach(arg) endforeach(arg)
set(${prefix}_${current_arg_name} ${current_arg_list}) set(${prefix}_${current_arg_name} ${current_arg_list})
ENDMACRO(PARSE_ARGUMENTS) ENDMACRO(PARSE_ARGUMENTS)
MACRO(CAR var) MACRO(CAR var)
set(${var} ${ARGV1}) set(${var} ${ARGV1})
ENDMACRO(CAR) ENDMACRO(CAR)
MACRO(CDR var junk) MACRO(CDR var junk)
set(${var} ${ARGN}) set(${var} ${ARGN})
ENDMACRO(CDR) ENDMACRO(CDR)
## ##
......
This diff is collapsed.
...@@ -29,28 +29,28 @@ ...@@ -29,28 +29,28 @@
if(NOT DEFINED PROCESSOR_COUNT) if(NOT DEFINED PROCESSOR_COUNT)
# Unknown: # Unknown:
set(NUMBER_OF_CPU 0) set(NUMBER_OF_CPU 0)
# Linux: # Linux:
set(cpuinfo_file "/proc/cpuinfo") set(cpuinfo_file "/proc/cpuinfo")
if(EXISTS "${cpuinfo_file}") if(EXISTS "${cpuinfo_file}")
file(STRINGS "${cpuinfo_file}" procs REGEX "^processor.: [0-9]+$") file(STRINGS "${cpuinfo_file}" procs REGEX "^processor.: [0-9]+$")
list(LENGTH procs NUMBER_OF_CPU) list(LENGTH procs NUMBER_OF_CPU)
endif() endif()
# Mac: # Mac:
if(APPLE) if(APPLE)
find_program(cmd_sys_pro "system_profiler") find_program(cmd_sys_pro "system_profiler")
if(cmd_sys_pro) if(cmd_sys_pro)
execute_process(COMMAND ${cmd_sys_pro} SPHardwareDataType OUTPUT_VARIABLE info) execute_process(COMMAND ${cmd_sys_pro} SPHardwareDataType OUTPUT_VARIABLE info)
string(REGEX REPLACE "^.*Total Number of Cores: ([0-9]+).*$" "\\1" string(REGEX REPLACE "^.*Total Number of Cores: ([0-9]+).*$" "\\1"
NUMBER_OF_CPU "${info}") NUMBER_OF_CPU "${info}")
endif()
endif() endif()
endif()
# Windows: # Windows:
if(WIN32) if(WIN32)
set(NUMBER_OF_CPU "$ENV{NUMBER_OF_PROCESSORS}") set(NUMBER_OF_CPU "$ENV{NUMBER_OF_PROCESSORS}")
endif() endif()
endif() endif()
...@@ -70,25 +70,25 @@ set( _prec_C OFF ) ...@@ -70,25 +70,25 @@ set( _prec_C OFF )
set( _prec_Z OFF ) set( _prec_Z OFF )
set( _prec_ZC OFF ) set( _prec_ZC OFF )
foreach(_prec ${RP_${CMAKE_PROJECT_NAME}_PRECISIONS}) foreach(_prec ${RP_${CMAKE_PROJECT_NAME}_PRECISIONS})
if ( ${_prec} STREQUAL "zc" ) if ( ${_prec} STREQUAL zc )
set( _prec_S ON ) set( _prec_S ON )
set( _prec_D ON ) set( _prec_D ON )
set( _prec_C ON ) set( _prec_C ON )
set( _prec_Z ON ) set( _prec_Z ON )
set( _prec_ZC ON ) set( _prec_ZC ON )
elseif( ${_prec} STREQUAL "z" ) elseif( ${_prec} STREQUAL z )
set( _prec_D ON ) set( _prec_D ON )
set( _prec_Z ON ) set( _prec_Z ON )
elseif( ${_prec} STREQUAL "c" ) elseif( ${_prec} STREQUAL c )
set( _prec_S ON ) set( _prec_S ON )
set( _prec_C ON ) set( _prec_C ON )
elseif( ${_prec} STREQUAL "ds" ) elseif( ${_prec} STREQUAL ds )
set( _prec_S ON ) set( _prec_S ON )
set( _prec_D ON ) set( _prec_D ON )
set( _prec_DS ON ) set( _prec_DS ON )
elseif( ${_prec} STREQUAL "d" ) elseif( ${_prec} STREQUAL d )
set( _prec_S ON ) set( _prec_S ON )
elseif( ${_prec} STREQUAL "s" ) elseif( ${_prec} STREQUAL s )
set( _prec_S ON ) set( _prec_S ON )
endif() endif()
endforeach() endforeach()
...@@ -223,27 +223,27 @@ MACRO(precisions_rules_py) ...@@ -223,27 +223,27 @@ MACRO(precisions_rules_py)
# Force the copy of the original files in the binary_dir # Force the copy of the original files in the binary_dir
# for VPATH compilation # for VPATH compilation
if( NOT ${CMAKE_PROJECT_NAME}_COMPILE_INPLACE ) if( NOT ${CMAKE_PROJECT_NAME}_COMPILE_INPLACE )
set(generate_out 1) set(generate_out 1)
else( NOT ${CMAKE_PROJECT_NAME}_COMPILE_INPLACE ) else( NOT ${CMAKE_PROJECT_NAME}_COMPILE_INPLACE )
string(COMPARE NOTEQUAL "${_dependency_OUTPUT}" "${_dependency_INPUT}" generate_out ) string(COMPARE NOTEQUAL "${_dependency_OUTPUT}" "${_dependency_INPUT}" generate_out )
endif() endif()
# We generate a dependency only if a file will be generated # We generate a dependency only if a file will be generated
if( got_file ) if( got_file )
if( generate_out ) if( generate_out )
# the custom command is executed in CMAKE_CURRENT_BINARY_DIR # the custom command is executed in CMAKE_CURRENT_BINARY_DIR
ADD_CUSTOM_COMMAND( ADD_CUSTOM_COMMAND(
OUTPUT ${_dependency_OUTPUT} OUTPUT ${_dependency_OUTPUT}
COMMAND ${CMAKE_COMMAND} -E remove -f ${_dependency_OUTPUT} && ${pythoncmd} && chmod a-w ${_dependency_OUTPUT} COMMAND ${CMAKE_COMMAND} -E remove -f ${_dependency_OUTPUT} && ${pythoncmd} && chmod a-w ${_dependency_OUTPUT}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_dependency_INPUT} ${RP_CODEGEN} ${RP_${CMAKE_PROJECT_NAME}_DICTIONNARY}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_dependency_INPUT} ${RP_CODEGEN} ${RP_${CMAKE_PROJECT_NAME}_DICTIONNARY})
set_SOURCE_FILES_PROPERTIES(${_dependency_OUTPUT} PROPERTIES COMPILE_FLAGS "-DPRECISION_${_dependency_PREC}" GENERATED 1 IS_IN_BINARY_DIR 1 ) set_SOURCE_FILES_PROPERTIES(${_dependency_OUTPUT} PROPERTIES COMPILE_FLAGS "-DPRECISION_${_dependency_PREC}" GENERATED 1 IS_IN_BINARY_DIR 1 )
else( generate_out ) else( generate_out )
set_SOURCE_FILES_PROPERTIES(${_dependency_OUTPUT} PROPERTIES COMPILE_FLAGS "-DPRECISION_${_dependency_PREC}" GENERATED 0 ) set_SOURCE_FILES_PROPERTIES(${_dependency_OUTPUT} PROPERTIES COMPILE_FLAGS "-DPRECISION_${_dependency_PREC}" GENERATED 0 )
endif( generate_out ) endif( generate_out )
list(APPEND ${OUTPUTLIST} ${_dependency_OUTPUT}) list(APPEND ${OUTPUTLIST} ${_dependency_OUTPUT})
endif( got_file ) endif( got_file )
endif() endif()
endforeach() endforeach()
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
# add a cache variable to let the user specify the BLAS vendor # add a cache variable to let the user specify the BLAS vendor
if (NOT MPI_FOUND) if (NOT MPI_FOUND)
if(MPIEXT_FIND_REQUIRED) if(MPIEXT_FIND_REQUIRED)
find_package(MPI REQUIRED) find_package(MPI REQUIRED)
else() else()
find_package(MPI) find_package(MPI)
endif() endif()
endif () endif ()
if (MPI_FOUND) if (MPI_FOUND)
...@@ -103,9 +103,9 @@ int main(int argc, char **argv) { ...@@ -103,9 +103,9 @@ int main(int argc, char **argv) {
if(NOT SERIALIZED_TEST_RUNS) if(NOT SERIALIZED_TEST_RUNS)
check_c_source_runs("${MPI_C_TEST_FUNNELED_SOURCE}" FUNNELED_TEST_RUNS) check_c_source_runs("${MPI_C_TEST_FUNNELED_SOURCE}" FUNNELED_TEST_RUNS)
if(NOT FUNNELED_TEST_RUNS) if(NOT FUNNELED_TEST_RUNS)
set(MPI_THREAD_SUPPORTED_LEVEL "MPI_THREAD_SINGLE") set(MPI_THREAD_SUPPORTED_LEVEL "MPI_THREAD_SINGLE")
else(NOT FUNNELED_TEST_RUNS) else(NOT FUNNELED_TEST_RUNS)
set(MPI_THREAD_SUPPORTED_LEVEL "MPI_THREAD_FUNNELED") set(MPI_THREAD_SUPPORTED_LEVEL "MPI_THREAD_FUNNELED")
endif(NOT FUNNELED_TEST_RUNS) endif(NOT FUNNELED_TEST_RUNS)
else(NOT SERIALIZED_TEST_RUNS) else(NOT SERIALIZED_TEST_RUNS)
set(MPI_THREAD_SUPPORTED_LEVEL "MPI_THREAD_SERIALIZED") set(MPI_THREAD_SUPPORTED_LEVEL "MPI_THREAD_SERIALIZED")
...@@ -117,4 +117,4 @@ int main(int argc, char **argv) { ...@@ -117,4 +117,4 @@ int main(int argc, char **argv) {
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE}) set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE})
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE}) set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SAVE})
set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE}) set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_SAVE})
endif(MPI_FOUND) endif(MPI_FOUND)
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -24,18 +24,18 @@ macro(jdf_rules jdf_rules_OUTPUTLIST jdf_rules_SOURCES) ...@@ -24,18 +24,18 @@ macro(jdf_rules jdf_rules_OUTPUTLIST jdf_rules_SOURCES)
if( jdf_rules_IsInBinaryDir ) if( jdf_rules_IsInBinaryDir )
add_custom_command( add_custom_command(
OUTPUT ${jdf_rules_OSRC}.h ${jdf_rules_OSRC}.c OUTPUT ${jdf_rules_OSRC}.h ${jdf_rules_OSRC}.c
COMMAND ${PARSEC_DAGUEPP} ${DAGUEPP_CFLAGS} ${ADDITIONAL_DAGUEPP_CFLAGS} -E -i ${jdf_rules_SRC}.jdf -o ${jdf_rules_OSRC} -f ${jdf_rules_BSRC} COMMAND ${PARSEC_DAGUEPP} ${DAGUEPP_CFLAGS} ${ADDITIONAL_DAGUEPP_CFLAGS} -E -i ${jdf_rules_SRC}.jdf -o ${jdf_rules_OSRC} -f ${jdf_rules_BSRC}
MAIN_DEPENDENCY ${CMAKE_CURRENT_BINARY_DIR}/${jdf_rules_SRC}.jdf MAIN_DEPENDENCY ${CMAKE_CURRENT_BINARY_DIR}/${jdf_rules_SRC}.jdf
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${jdf_rules_SRC}.jdf ${PARSEC_DAGUEPP}) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${jdf_rules_SRC}.jdf ${PARSEC_DAGUEPP})
else( jdf_rules_IsInBinaryDir ) else( jdf_rules_IsInBinaryDir )
add_custom_command( add_custom_command(
OUTPUT ${jdf_rules_OSRC}.h ${jdf_rules_OSRC}.c OUTPUT ${jdf_rules_OSRC}.h ${jdf_rules_OSRC}.c
COMMAND ${PARSEC_DAGUEPP} ${DAGUEPP_CFLAGS} ${ADDITIONAL_DAGUEPP_CFLAGS} -E -i ${jdf_rules_SRC}.jdf -o ${jdf_rules_OSRC} -f ${jdf_rules_BSRC} COMMAND ${PARSEC_DAGUEPP} ${DAGUEPP_CFLAGS} ${ADDITIONAL_DAGUEPP_CFLAGS} -E -i ${jdf_rules_SRC}.jdf -o ${jdf_rules_OSRC} -f ${jdf_rules_BSRC}
MAIN_DEPENDENCY ${jdf_rules_SR