Commit a505c7e5 authored by Cyrille Piacibello's avatar Cyrille Piacibello

Merge branch 'master' into ib

Merge with modification related to CMakeLists and naming.
parents 98f18541 555c02c0
......@@ -34,3 +34,9 @@ foreach(_test ${IBGMRES_API_TEST})
install(TARGETS ${_name_exe}
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/ibgmresdr)
endforeach()
# # Rules for installing the project
install (TARGETS ibgmresdr DESTINATION lib)
install (FILES src/Ib-GMRes-Dr.h DESTINATION include)
......@@ -56,12 +56,12 @@ typedef void (*Callback_RightCond)(void * preCond,int nbVectInBlock,
/**
* @brief Enum over different arithmetic available
*/
typedef enum arithmetic{
typedef enum ibgmresdr_arithmetic{
FLOAT = 0,
DOUBLE = 1,
CMPLX_FLT = 2,
CMPLX_DBL = 3
} Arithmetic;
} ibgmresdr_Arithmetic;
/**
* @brief Init the library.
......@@ -76,7 +76,7 @@ typedef enum arithmetic{
* @return Generic ptr, must be provided to each call to Library's
* API function
*/
IbGMResDr_handle Init_ibgmresdr(Arithmetic ARI, void * Matrix, int dim, void * userEnv);
IbGMResDr_handle Init_ibgmresdr(ibgmresdr_Arithmetic ARI, void * Matrix, int dim, void * userEnv);
/**
* @brief Free the Library
......
......@@ -8,7 +8,7 @@ extern "C" {
* Implement Init function by creating an instance of the Engine
* class. The ptr to the instance is the Handle.
*/
extern "C" IbGMResDr_handle Init_ibgmresdr(Arithmetic ARI,
extern "C" IbGMResDr_handle Init_ibgmresdr(ibgmresdr_Arithmetic ARI,
void * Matrix, int dim, void * userEnv){
switch(ARI){
case FLOAT:{
......
......@@ -49,11 +49,27 @@ else()
endif(LAPACKE_FOUND)
option(DEBUG_MODE "Set to On to compile with debug info" OFF)
option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
if(DEBUG_MODE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
endif()
if(BUILD_SHARED_LIBS)
# Set the RPATH config
# --------------------
# use, i.e. don't skip the full RPATH for the build tree
set(CMAKE_SKIP_BUILD_RPATH FALSE)
# when building, don't use the install RPATH already
# (but later on when installing)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
# the RPATH to be used when installing
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
#Ajout d'un repertoire src
......
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