1
0
mirror of https://github.com/TREX-CoE/trexio.git synced 2024-12-23 04:43:57 +01:00

Merge pull request #133 from joguenzl/master

This commit is contained in:
Evgeny Posenitskiy 2023-12-09 12:13:24 +01:00 committed by GitHub
commit cea5f1b02d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 13 deletions

View File

@ -15,8 +15,9 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
# Optional configure for developer mode to generate source code from org-mode files. # Optional configure for developer mode to generate source code from org-mode files.
option(TREXIO_DEVEL "TREXIO developer mode (for code generation)." OFF) option(TREXIO_DEVEL "TREXIO developer mode (for code generation)." OFF)
option(TREXIO_TESTS "Whether to perform tests for TREXIO" ON)
if(EXISTS "${CMAKE_SOURCE_DIR}/.devel") if(EXISTS "${PROJECT_SOURCE_DIR}/.devel")
set(TREXIO_DEVEL ON) set(TREXIO_DEVEL ON)
find_package(Python3 REQUIRED) find_package(Python3 REQUIRED)
if(Python3_FOUND) if(Python3_FOUND)
@ -48,8 +49,8 @@ if(EXISTS "${CMAKE_SOURCE_DIR}/.devel")
set(TREXIO_USER_NAME $ENV{USER}) set(TREXIO_USER_NAME $ENV{USER})
# replace placeholders in the templace config.h.in file to produce config.h # replace placeholders in the templace config.h.in file to produce config.h
# config.h is needed to insert TREXIO_PACKAGE_VERSION and TREXIO_GIT_HASH into trexio.h # config.h is needed to insert TREXIO_PACKAGE_VERSION and TREXIO_GIT_HASH into trexio.h
configure_file(${CMAKE_SOURCE_DIR}/include/cmake_config.h.in configure_file(${PROJECT_SOURCE_DIR}/include/cmake_config.h.in
${CMAKE_SOURCE_DIR}/include/config.h ${PROJECT_SOURCE_DIR}/include/config.h
@ONLY) @ONLY)
endif() endif()
@ -60,5 +61,7 @@ include_directories(include)
add_subdirectory(src) add_subdirectory(src)
# Add subdirectory with unit tests. # Add subdirectory with unit tests.
if(TREXIO_TESTS)
enable_testing() enable_testing()
add_subdirectory(tests) add_subdirectory(tests)
endif()

View File

@ -11,6 +11,7 @@
# $ export TREXIO_DIR=<custom_path> # $ export TREXIO_DIR=<custom_path>
# to indicate the prefix used during the TREXIO installation # to indicate the prefix used during the TREXIO installation
# (typically `./configure prefix=<custom_path> ..` or `cmake -DCMAKE_INSTALL_DIR=<custom_path> ..`) # (typically `./configure prefix=<custom_path> ..` or `cmake -DCMAKE_INSTALL_DIR=<custom_path> ..`)
# Alternatively, TREXIO_DIR can be provided in a CMake cache.
# This file should be located WITHIN your project source tree. # This file should be located WITHIN your project source tree.
# (e.g. in cmake/FindTREXIO.cmake) # (e.g. in cmake/FindTREXIO.cmake)
@ -45,9 +46,13 @@ set(TREXIO_SEARCH_PATHS
/opt /opt
) )
if (NOT TREXIO_DIR)
set(TREXIO_DIR $ENV{TREXIO_DIR})
endif()
find_path(TREXIO_INCLUDE_DIR find_path(TREXIO_INCLUDE_DIR
NAMES trexio.h NAMES trexio.h
HINTS $ENV{TREXIO_DIR} HINTS "${TREXIO_DIR}"
PATH_SUFFIXES include/trexio include PATH_SUFFIXES include/trexio include
PATHS ${TREXIO_SEARCH_PATHS} PATHS ${TREXIO_SEARCH_PATHS}
) )
@ -57,7 +62,7 @@ find_path(TREXIO_INCLUDE_DIR
# suffix (e.g. .so on Unix or .dylib on MacOS) in NAMES. CMake takes care of that. # suffix (e.g. .so on Unix or .dylib on MacOS) in NAMES. CMake takes care of that.
find_library(TREXIO_LIBRARY find_library(TREXIO_LIBRARY
NAMES trexio NAMES trexio
HINTS $ENV{TREXIO_DIR} HINTS "${TREXIO_DIR}"
PATH_SUFFIXES lib64 lib PATH_SUFFIXES lib64 lib
PATHS ${TREXIO_SEARCH_PATHS} PATHS ${TREXIO_SEARCH_PATHS}
) )

View File

@ -19,7 +19,7 @@ set(TREXIO_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/trexio.c ${CMAKE_CURRENT_SOURCE_DIR}/trexio.c
${CMAKE_CURRENT_SOURCE_DIR}/trexio_text.c ${CMAKE_CURRENT_SOURCE_DIR}/trexio_text.c
) )
set(TREXIO_PUBLIC_HEADERS ${CMAKE_SOURCE_DIR}/include/trexio.h) set(TREXIO_PUBLIC_HEADERS ${PROJECT_SOURCE_DIR}/include/trexio.h)
set(TREXIO_PRIVATE_HEADERS set(TREXIO_PRIVATE_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/trexio_s.h ${CMAKE_CURRENT_SOURCE_DIR}/trexio_s.h
${CMAKE_CURRENT_SOURCE_DIR}/trexio_private.h ${CMAKE_CURRENT_SOURCE_DIR}/trexio_private.h
@ -101,7 +101,7 @@ include(FortranCInterface)
FortranCInterface_VERIFY() FortranCInterface_VERIFY()
# Fortran module # Fortran module
set(TREXIO_MOD_FILE ${CMAKE_SOURCE_DIR}/include/trexio_f.f90) set(TREXIO_MOD_FILE ${PROJECT_SOURCE_DIR}/include/trexio_f.f90)
# Export to parent scope so tests directory picks this up. # Export to parent scope so tests directory picks this up.
set(TREXIO_MOD_FILE ${TREXIO_MOD_FILE} PARENT_SCOPE) set(TREXIO_MOD_FILE ${TREXIO_MOD_FILE} PARENT_SCOPE)
# Add TREXIO Fortran module as a library. # Add TREXIO Fortran module as a library.
@ -115,7 +115,7 @@ if(TREXIO_DEVEL)
set(ORG_FILES set(ORG_FILES
templates_front/templator_front.org templates_front/templator_front.org
templates_text/templator_text.org templates_text/templator_text.org
${CMAKE_SOURCE_DIR}/trex.org ${PROJECT_SOURCE_DIR}/trex.org
) )
if(ENABLE_HDF5) if(ENABLE_HDF5)
list(APPEND ORG_FILES templates_hdf5/templator_hdf5.org) list(APPEND ORG_FILES templates_hdf5/templator_hdf5.org)
@ -127,8 +127,8 @@ if(TREXIO_DEVEL)
${TREXIO_PRIVATE_HEADERS} ${TREXIO_PRIVATE_HEADERS}
${TREXIO_MOD_FILE} ${TREXIO_MOD_FILE}
COMMAND ./build_trexio.sh COMMAND ./build_trexio.sh
DEPENDS ${ORG_FILES} ${CMAKE_SOURCE_DIR}/include/config.h DEPENDS ${ORG_FILES} ${PROJECT_SOURCE_DIR}/include/config.h
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tools WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/tools
COMMENT "Generating TREXIO source code from org-mode files." COMMENT "Generating TREXIO source code from org-mode files."
VERBATIM) VERBATIM)
@ -156,7 +156,7 @@ install(FILES ${TREXIO_MOD_FILE} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
# https://gitlab.kitware.com/cmake/community/wikis/FAQ#can-i-do-make-uninstall-with-cmake # https://gitlab.kitware.com/cmake/community/wikis/FAQ#can-i-do-make-uninstall-with-cmake
if(NOT TARGET uninstall) if(NOT TARGET uninstall)
configure_file( configure_file(
"${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${PROJECT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY) IMMEDIATE @ONLY)