Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update main CMakeLists to set mpfr optional #302

Merged
merged 5 commits into from
Sep 28, 2022
Merged

update main CMakeLists to set mpfr optional #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e465cd
update main cmake lists to set mpfr optional
nkx111 Sep 18, 2022
80de275
update CMakeLists.txt
nkx111 Sep 18, 2022
7b2628b
Update .gitlab-ci.yml
nkx111 Sep 19, 2022
8a18479
Update validation.yml
nkx111 Sep 19, 2022
a893ba5
Merge branch 'master' into nkx111-optional-MPFR
jgalan Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Build and install
uses: rest-for-physics/framework/.github/actions/build@master
with:
cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON -DTEST=ON"
cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON -DREST_MPFR=ON -DTEST=ON"
branch: ${{ env.BRANCH_NAME }}
build-path: build
- name: Test
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Build and install
uses: rest-for-physics/framework/.github/actions/build@master
with:
cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON"
cmake-flags: "-DCMAKE_INSTALL_PREFIX=${{ env.REST_PATH }} -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -DCMAKE_PREFIX_PATH=$GARFIELD_INSTALL -DREST_ALL_LIBS=ON -DREST_G4=ON -DREST_GARFIELD=ON -DREST_MPFR=ON"
branch: ${{ env.BRANCH_NAME }}
- name: Test REST
run: |
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Build and Install:
- rm -rf ${CI_PROJECT_DIR}/build && mkdir ${CI_PROJECT_DIR}/build && cd ${CI_PROJECT_DIR}/build
- rm -rf ${CI_PROJECT_DIR}/install
- cmake ${CI_PROJECT_DIR} -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR}/install
-DREST_ALL_LIBS=ON -DREST_GARFIELD=ON -DREST_G4=ON -DREST_WELCOME=OFF
-DREST_ALL_LIBS=ON -DREST_GARFIELD=ON -DREST_G4=ON -DREST_WELCOME=OFF -DREST_MPFR=ON
- make install -j2

artifacts:
Expand Down
87 changes: 52 additions & 35 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,6 @@ if (NOT DEFINED CMAKE_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX_ABSOLUTE})
endif ()

if (NOT DEFINED RESTLIB_MODEL)
set(RESTLIB_MODEL OFF)
endif ()

# Auto schema evolution for ROOT
if (NOT DEFINED REST_SE)
set(REST_SE ON)
endif ()
set(SCHEMA_EVOLUTION ${REST_SE})

# Welcome message
if (NOT DEFINED REST_WELCOME)
set(REST_WELCOME ON)
Expand All @@ -60,11 +50,16 @@ set(external_libs)
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${DECAY_PATH}/cmake ${CMAKE_MODULE_PATH})
set(CMAKE_MACOSX_RPATH 1)

# ROOT libs and includes

##### ROOT libs and includes #####
find_package(ROOT REQUIRED)

set(ROOT_REQUIRED_LIBRARIES Core RIO Geom Gdml Minuit Spectrum XMLIO)

# Auto schema evolution for ROOT
if (NOT DEFINED REST_SE)
set(REST_SE ON)
endif ()
set(SCHEMA_EVOLUTION ${REST_SE})

# Switch to enable ROOT Eve functionality.
if (NOT DEFINED REST_EVE)
set(REST_EVE ON)
Expand Down Expand Up @@ -111,44 +106,66 @@ else ()
C++ standard, check root-config --cflags ${ROOT_CFLAGS}"
)
endif ()

endif ()

set(external_include_dirs ${external_include_dirs} ${ROOT_INCLUDE_DIRS})



##### mySQL #####
# This is to enable linking of SQL libraries. I.e. for process TRestSQLToAnalysisProcess.
if (NOT DEFINED SQL)
set(SQL OFF)
if (NOT DEFINED REST_SQL)
set(REST_SQL OFF)
endif ()

if (${SQL} MATCHES "ON")
list(APPEND rest_features "SQL")
if (${REST_SQL} MATCHES "ON")
list(APPEND rest_features "mySQL")
add_definitions(-DUSE_SQL)
include(FindSQL)
set(external_include_dirs ${external_include_dirs} ${SQL_INCLUDE_DIR})
set(external_libs "${external_libs} ${SQL_LIBRARIES}")
message(STATUS "SQL include directory: " ${SQL_INCLUDE_DIR})
set(SQL ON)
else ()
set(SQL OFF)
endif (${SQL} MATCHES "ON")

#### MPFR
find_path(MPFR_INCLUDE mpfr.h HINTS ${MPFR_PATH} ${MPFR_PATH}/include) # path to include directory
find_path(MPFR_LIB_PATH libmpfr.so HINTS ${MPFR_PATH} ${MPFR_PATH}/lib) # path to include directory
find_library(MPFR_LIB mpfr HINTS ${MPFR_PATH} ${MPFR_PATH}/lib) # path to .so file

if (NOT MPFR_INCLUDE MATCHES "MPFR_INCLUDE-NOTFOUND" AND NOT MPFR_LIB MATCHES "MPFR_LIB-NOTFOUND")
# MPFR is found
add_compile_definitions(USE_MPFR)
set(external_include_dirs ${external_include_dirs} ${MPFR_INCLUDE})
set(external_libs "${external_libs};${MPFR_LIB}")
link_directories(${MPFR_LIB})
message( STATUS "MPFR library : ${MPFR_LIB}" )
set(REST_SQL OFF)
endif (${REST_SQL} MATCHES "ON")

##### MPFR #####
if (NOT DEFINED REST_MPFR)
set(REST_MPFR OFF)
endif ()
if (${REST_MPFR} MATCHES "ON")
find_path(MPFR_INCLUDE mpfr.h HINTS ${MPFR_PATH} ${MPFR_PATH}/include) # path to include directory
find_path(MPFR_LIB_PATH libmpfr.so HINTS ${MPFR_PATH} ${MPFR_PATH}/lib)
find_library(MPFR_LIB mpfr HINTS ${MPFR_PATH} ${MPFR_PATH}/lib) # path to .so file
if (NOT MPFR_INCLUDE MATCHES "MPFR_INCLUDE-NOTFOUND" AND NOT MPFR_LIB MATCHES "MPFR_LIB-NOTFOUND")
# MPFR is found
list(APPEND rest_features "MPFR")
add_compile_definitions(USE_MPFR)
set(external_include_dirs ${external_include_dirs} ${MPFR_INCLUDE})
set(external_libs "${external_libs};${MPFR_LIB}")
link_directories(${MPFR_LIB})
message( STATUS "MPFR library : ${MPFR_LIB}" )
else ()
message(ERROR "MPFR library was not found. Adding the location to the installation path may solve this problem.\n Use -DMPFR_PATH=/path/to/mpfr/")
endif ()
else ()
message(WARNING "MPFR library was not found. Adding the location to the installation path may solve this problem.\n Use -DMPFR_PATH=/path/to/mpfr/")
set(REST_MPFR OFF)
set(excludes ${excludes} TRestComplex)
endif (${REST_MPFR} MATCHES "ON")

##### CURL #####
find_library(CURL_LIB curl)
if (NOT ${CURL_LIB} STREQUAL "CURL_LIB-NOTFOUND")
list(APPEND rest_features "CURL")
add_compile_definitions(USE_Curl)
message(STATUS "Found curl library: ${CURL_LIB}")
set(external_libs "${external_libs};-lcurl")
else ()
message(WARNING "CURL library was not found. ")
endif ()



# Include directories for compilation
include_directories(${external_include_dirs})
message(STATUS "external include directory: " ${external_include_dirs})
Expand Down
6 changes: 0 additions & 6 deletions source/framework/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@ endif (CMAKE_SYSTEM_NAME MATCHES "Windows")

set(external_libs "${external_libs};-lstdc++fs") # sometimes needed for <filesystem>

find_library(CURL_LIB curl)
if (NOT ${CURL_LIB} STREQUAL "CURL_LIB-NOTFOUND")
add_compile_definitions(USE_Curl)
message(STATUS "Found curl library: ${CURL_LIB}")
set(external_libs "${external_libs};-lcurl")
endif ()

COMPILEDIR(RestFramework)

Expand Down