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 regenie to 3.6 #50468

Merged
merged 16 commits into from
Oct 28, 2024
+359 −3
Merged

Update regenie to 3.6 #50468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
73725d8
Update regenie to 3.4.1
BiocondaBot Feb 1, 2024
1e9fc36
Update regenie to 3.4.1
BiocondaBot Feb 1, 2024
59be5d2
add patch for v3.4.1
joellembatchou Feb 1, 2024
346908e
Update regenie to 3.5
BiocondaBot Jul 3, 2024
93e5f37
update meta.yml file
joellembatchou Jul 3, 2024
6dc90d7
update patch
joellembatchou Jul 3, 2024
c8c37c6
fix boost version
joellembatchou Jul 3, 2024
22c029c
Update regenie to 3.6
BiocondaBot Sep 3, 2024
6ac3e13
change patch for regenie v3.6
joellembatchou Sep 3, 2024
af18e9c
Merge branch 'master' into bump/regenie
joellembatchou Sep 5, 2024
be0a81e
Merge branch 'master' into bump/regenie
joellembatchou Sep 6, 2024
c1d99b4
Merge branch 'master' into bump/regenie
joellembatchou Sep 9, 2024
df1dcae
Merge branch 'master' into bump/regenie
joellembatchou Sep 19, 2024
a3f102e
Merge branch 'master' into bump/regenie
joellembatchou Oct 8, 2024
977ab90
Merge branch 'master' into bump/regenie
joellembatchou Oct 9, 2024
6aab98d
Merge branch 'master' into bump/regenie
mencian Oct 28, 2024
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
7 changes: 4 additions & 3 deletions recipes/regenie/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set name = "regenie" %}
{% set version = "3.5" %}
{% set sha256 = "48dfe8efa7b8acb6771452e3b53008f97d4a5c1241d5dbc3380d994b70a07a8c" %}
{% set version = "3.6" %}
{% set sha256 = "bb935b196da08ef7b37dad9736022030a686ae84539c47c106de6096d4612e09" %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

SHA256 checksum verification failed.

The checksum could not be verified due to missing or incorrectly referenced patch files and the absence of the meta.yaml file. Please ensure that all patch files are present and correctly referenced, and that meta.yaml exists in the repository.

🔗 Analysis chain

Verify the SHA256 checksum.

The SHA256 checksum has been updated, which is expected for a new version. However, it's crucial to ensure that this new checksum is correct for version 3.6 of regenie.

To verify the checksum, you can run the following script:

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the SHA256 checksum of the regenie v3.6 source tarball.

# Download the source tarball
curl -L https://github.com/rgcgithub/regenie/archive/v3.6.tar.gz -o regenie-3.6.tar.gz

# Calculate the SHA256 checksum
calculated_checksum=$(sha256sum regenie-3.6.tar.gz | awk '{print $1}')

# Compare with the checksum in the recipe
expected_checksum="bb935b196da08ef7b37dad9736022030a686ae84539c47c106de6096d4612e09"

if [ "$calculated_checksum" = "$expected_checksum" ]; then
    echo "Checksum verification passed."
else
    echo "Checksum verification failed."
    echo "Expected: $expected_checksum"
    echo "Calculated: $calculated_checksum"
fi

# Clean up
rm regenie-3.6.tar.gz

Length of output: 676


package:
name: {{ name|lower }}
Expand All @@ -24,7 +24,8 @@ source:
# - patches/0011-update-cmakelist-file-for-v3.2.9.patch
# - patches/0012-update-cmakelist-file-for-v3.4.patch
# - patches/0013-update-cmakelist-file-for-v3.4.1.patch
- patches/0014-update-cmakelist.txt-for-v3.5.patch
# - patches/0014-update-cmakelist.txt-for-v3.5.patch
- patches/0015-update-cmakelist.txt-for-v3.6.patch

build:
number: 0
Expand Down
355 changes: 355 additions & 0 deletions recipes/regenie/patches/0015-update-cmakelist.txt-for-v3.6.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,355 @@
From eac9852f500ba04d75e7f4ad178f365ce690bfa9 Mon Sep 17 00:00:00 2001
From: Joelle Mbatchou <[email protected]>
Date: Tue, 3 Sep 2024 12:29:13 -0400
Subject: [PATCH] update cmakelist file for v3.6

---
CMakeLists.txt | 241 ++++++++++++++++++++-----------------------------
1 file changed, 97 insertions(+), 144 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b874c33..b3b9950 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,3 @@
-# For Intel MKL, set MKLROOT=<MKL_path> when running cmake
-# e.g. MKLROOT=/opt/mkl/ cmake -S regenie_dir/ -B regenie_dir/build/
-# For OpenBLAS, set OPENBLAS_ROOT=<OpenBLAS_path> when running cmake
-# note: it also requires lapacke library
-# For static compilation on Linux systems, set STATIC=1 when running cmake
-# -> this excludes GLIBC
-
-
cmake_minimum_required(VERSION 3.13)

# detect OS architecture
@@ -33,57 +25,16 @@ set(CMAKE_CXX_EXTENSIONS OFF) # Ensures -std=c++11
######################################
######## check input variables

-# check BGEN_PATH
-if("$ENV{BGEN_PATH}" STREQUAL "")
- message( FATAL_ERROR "Must specify path to BGEN library in 'BGEN_PATH'")
-else()
- set(BGEN_PATH "$ENV{BGEN_PATH}" CACHE INTERNAL "Set BGEN library path")
- if (NOT EXISTS ${BGEN_PATH})
- message( FATAL_ERROR "Specified BGEN library directory '${BGEN_PATH}' does not exist")
- endif()
-endif()
-
# check for static compilation
-if($ENV{STATIC})
+if(BUILD_SHARED_LIBS)
+ set(BUILD_STATIC OFF CACHE INTERNAL "Dynamic compilation")
+ set(Boost_USE_STATIC_LIBS OFF)
+else()
set(BUILD_STATIC ON CACHE INTERNAL "Static compilation")
+ set(Boost_USE_STATIC_LIBS ON)
message( STATUS "Static compilation mode")
Comment on lines +42 to +48
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Ensure correct logic for build type determination

The condition for setting BUILD_STATIC has been changed from checking the environment variable STATIC to BUILD_SHARED_LIBS. This modifies how the build system determines whether to perform a static or dynamic build. Ensure that BUILD_SHARED_LIBS is properly defined in all build configurations and that this change does not unintentionally alter the build behavior.

Consider setting a default value for BUILD_SHARED_LIBS or adjusting the logic to handle cases where it might be undefined.

endif()

-# check Boost IOStreams
-if($ENV{HAS_BOOST_IOSTREAM})
- set(HAS_BOOST_IOSTREAM 1 CACHE INTERNAL "Add Boost IO")
- set(RG_VERSION "${RG_VERSION}.gz" CACHE INTERNAL "Update version")
-else()
- set(HAS_BOOST_IOSTREAM 0 CACHE INTERNAL "Skip Boost IO")
-endif()
-
-# check MKL
-if(NOT "$ENV{MKLROOT}" STREQUAL "")
- set(MKLROOT "$ENV{MKLROOT}" CACHE INTERNAL "Set MKL library path")
- if (NOT EXISTS ${MKLROOT})
- message( FATAL_ERROR "Specified MKL library directory '${MKLROOT}' does not exist")
- endif()
- message( STATUS "Will compile with Intel MKL library")
-endif()
-
-# check HTSlib
-if(NOT "$ENV{HTSLIB_PATH}" STREQUAL "")
- set(HTSLIB_PATH "$ENV{HTSLIB_PATH}" CACHE INTERNAL "Set HTSlib library path")
- if (NOT EXISTS ${HTSLIB_PATH})
- message( FATAL_ERROR "Specified HTSlib library directory '${HTSLIB_PATH}' does not exist")
- endif()
- message( STATUS "Will compile with HTSlib")
-endif()
-
-# check OpenBLAS
-if(NOT "$ENV{OPENBLAS_ROOT}" STREQUAL "")
- set(OPENBLAS_ROOT "$ENV{OPENBLAS_ROOT}" CACHE INTERNAL "Set OpenBLAS library path")
- if (NOT EXISTS ${OPENBLAS_ROOT})
- message( FATAL_ERROR "Specified OpenBLAS library directory '${OPENBLAS_ROOT}' does not exist")
- endif()
- message( STATUS "Will compile with OpenBLAS library")
-endif()
-
######################################
######## set flags and required libraries

@@ -92,9 +43,10 @@ set(Boost_USE_STATIC_LIBS ${BUILD_STATIC})
set(Boost_USE_DEBUG_LIBS OFF)
set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_RUNTIME OFF)
+set(MKLROOT "${CMAKE_PREFIX_PATH}")

-# list each file specifically
-add_executable(regenie
+# list each file specifically
+add_executable(regenie
${CMAKE_SOURCE_DIR}/src/Data.cpp
${CMAKE_SOURCE_DIR}/src/Files.cpp
${CMAKE_SOURCE_DIR}/src/Geno.cpp
@@ -116,32 +68,54 @@ add_executable(regenie
${CMAKE_SOURCE_DIR}/src/cox_score.cpp
${CMAKE_SOURCE_DIR}/src/cox_firth.cpp
)
-target_include_directories(regenie PRIVATE ${CMAKE_SOURCE_DIR}/src)
+target_include_directories(regenie PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_PREFIX_PATH}/include)

Comment on lines +107 to +108
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Assess the impact of changing visibility from PRIVATE to PUBLIC

The visibility of include directories and linked libraries in target_include_directories and target_link_libraries has been changed from PRIVATE to PUBLIC. This change exposes internal headers and libraries to any project that links against regenie, which may not be intended if regenie is not designed to be used as a library.

If exposing these directories and libraries is not necessary, consider retaining PRIVATE visibility to encapsulate internal dependencies and prevent potential linkage issues in downstream projects.

Also applies to: 129-130, 207-207, 216-216, 225-225, 233-233, 242-242, 260-260, 268-268, 297-297, 305-305

set(CMAKE_CXX_FLAGS "-O3 -Wall -pedantic -ffast-math -Wno-unused-local-typedefs -Wno-deprecated-declarations -Wno-long-long -Wno-c11-extensions -fPIC")
-add_definitions(-DVERSION_NUMBER="${RG_VERSION}")

+find_package(OpenMP REQUIRED)
+target_link_libraries(regenie OpenMP::OpenMP_CXX)
if("${UNAME_S}" STREQUAL "Linux")
- find_package(OpenMP REQUIRED)
- target_link_libraries(regenie PRIVATE OpenMP::OpenMP_CXX)
if(${BUILD_STATIC})
- target_link_options(regenie BEFORE PRIVATE -static-libgcc PRIVATE -static-libstdc++)
+ target_link_options(regenie BEFORE -static-libgcc -static-libstdc++)
endif()
elseif("${UNAME_S}" STREQUAL "Darwin")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif()

-set(EXTERN_LIBS_PATH "${CMAKE_SOURCE_DIR}/external_libs")
-target_include_directories(regenie PRIVATE ${EXTERN_LIBS_PATH}/)
+set(EXTERN_LIBS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/external_libs")
+target_include_directories(regenie PUBLIC ${EXTERN_LIBS_PATH}/)
+
+# for BGEN (choose static if present first)
+find_library(ZSTD_LIBRARY zstd REQUIRED)
+find_library(DB_LIBRARY
+ NAMES libdb.a db
+ REQUIRED
+ )
+find_library(SQLITE3_LIBRARY sqlite3 REQUIRED)
+find_package(Boost
+ REQUIRED COMPONENTS system filesystem thread
+ OPTIONAL_COMPONENTS iostreams
+ )
+find_library(BGEN_LIBRARY
+ NAMES libbgen.a
+ REQUIRED
+ )
+target_link_libraries(regenie ${ZSTD_LIBRARY} ${BGEN_LIBRARY} ${DB_LIBRARY} ${SQLITE3_LIBRARY} ${Boost_LIBRARIES})
+target_include_directories(regenie
+ PUBLIC
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/genfile>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/db>
+ $<INSTALL_INTERFACE:${BOOST_INCLUDEDIR}>
+ )
+add_definitions(${Boost_DEFINITIONS})

-# BGEN library and its dependencies
-find_library(ZSTD_LIBRARY libzstd.a HINTS "${BGEN_PATH}/build/3rd_party/zstd-1.1.0" REQUIRED)
-find_library(DB_LIBRARY libdb.a HINTS "${BGEN_PATH}/build/db" REQUIRED)
-find_library(SQLITE3_LIBRARY libsqlite3.a HINTS "${BGEN_PATH}/build/3rd_party/sqlite3" REQUIRED)
-find_library(Boost_LIBRARY libboost.a HINTS "${BGEN_PATH}/build/3rd_party/boost_1_55_0" REQUIRED)
-find_library(BGEN_LIBRARY libbgen.a HINTS "${BGEN_PATH}/build" REQUIRED)
-target_link_libraries(regenie PRIVATE ${ZSTD_LIBRARY} ${BGEN_LIBRARY} ${DB_LIBRARY} ${SQLITE3_LIBRARY} ${Boost_LIBRARY})
-target_include_directories(regenie PRIVATE ${BGEN_PATH} ${BGEN_PATH}/genfile/include/ ${BGEN_PATH}/3rd_party/boost_1_55_0/ ${BGEN_PATH}/3rd_party/zstd-1.1.0/lib ${BGEN_PATH}/db/include/ ${BGEN_PATH}/3rd_party/sqlite3)
+# Boost IO
+if(Boost_iostreams_FOUND)
+ add_definitions(-DHAS_BOOST_IOSTREAM)
+ set(RG_VERSION "${RG_VERSION}.gz" CACHE INTERNAL "Update version")
+ message( STATUS "Will compile with Boost Iostreams library")
+endif()

# MVTNorm library
set(MVTN_PATH "${EXTERN_LIBS_PATH}/mvtnorm")
@@ -150,7 +124,7 @@ add_custom_target(
COMMAND make
WORKING_DIRECTORY ${MVTN_PATH}
)
-target_link_libraries(regenie PRIVATE ${MVTN_PATH}/libMvtnorm.a)
+target_link_libraries(regenie ${MVTN_PATH}/libMvtnorm.a)
add_dependencies(regenie libMvtnorm)

# QF library
@@ -160,7 +134,7 @@ add_custom_target(
COMMAND make
WORKING_DIRECTORY ${QF_PATH}
)
-target_link_libraries(regenie PRIVATE ${QF_PATH}/qf.a)
+target_link_libraries(regenie ${QF_PATH}/qf.a)
add_dependencies(regenie libqf)

# Quadpack library
@@ -170,7 +144,7 @@ add_custom_target(
COMMAND make
WORKING_DIRECTORY ${QUAD_PATH}
)
-target_link_libraries(regenie PRIVATE ${QUAD_PATH}/libquad.a)
+target_link_libraries(regenie ${QUAD_PATH}/libquad.a)
add_dependencies(regenie libquad)

# PGEN library
@@ -180,12 +154,12 @@ add_custom_target(
COMMAND make
WORKING_DIRECTORY ${PGEN_PATH}
)
-target_link_libraries(regenie PRIVATE ${PGEN_PATH}/pgenlib.a)
-target_include_directories(regenie PRIVATE ${PGEN_PATH} ${PGEN_PATH}/simde/ ${PGEN_PATH}/include/)
+target_link_libraries(regenie ${PGEN_PATH}/pgenlib.a)
+target_include_directories(regenie PUBLIC ${PGEN_PATH} ${PGEN_PATH}/simde/ ${PGEN_PATH}/include/)
add_dependencies(regenie pgenlib)

# REMETA library
-if(EXISTS ${HTSLIB_PATH})
+if(DEFINED HTSLIB_PATH)
set(REMETA_PATH "${EXTERN_LIBS_PATH}/remeta")
add_custom_target(
remeta
@@ -209,91 +183,70 @@ if(EXISTS ${HTSLIB_PATH})
endif()

# Intel MKL
-if(EXISTS ${MKLROOT})
+if(DEFINED MKLROOT)
Comment on lines +220 to +221
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Validate the change from EXISTS to DEFINED for MKLROOT

The condition checking for MKLROOT has been changed from if(EXISTS ${MKLROOT}) to if(DEFINED MKLROOT). This alters the behavior from verifying whether the MKLROOT directory exists to merely checking if the variable is defined. Ensure that this change does not lead to issues when MKLROOT is defined but points to a non-existent directory.

Consider combining both checks:

if(DEFINED MKLROOT AND EXISTS ${MKLROOT})

This ensures that MKLROOT is both defined and points to a valid directory.

add_definitions(-DWITH_MKL -DEIGEN_USE_BLAS -DEIGEN_USE_LAPACKE)
- target_include_directories(regenie PRIVATE ${MKLROOT}/include/)
- if(${BUILD_STATIC}) # specify static libs
- find_library(MKL_LP64_LIB libmkl_intel_lp64.a
- HINTS "${MKLROOT}/lib/intel64"
- "${MKLROOT}/lib"
- REQUIRED)
- find_library(MKL_THREAD_LIB libmkl_gnu_thread.a
- HINTS "${MKLROOT}/lib/intel64"
- "${MKLROOT}/lib"
- REQUIRED)
- find_library(MKL_CORE_LIB libmkl_core.a
- HINTS "${MKLROOT}/lib/intel64"
- "${MKLROOT}/lib"
- REQUIRED)
- target_link_libraries(regenie PRIVATE "-Wl,--start-group" ${MKL_LP64_LIB} ${MKL_THREAD_LIB} ${MKL_CORE_LIB} "-Wl,--end-group" -lgomp)
- else() # use dynamic libs
- find_library(MKL_LP64_LIB mkl_intel_lp64
- PATHS "${MKLROOT}/lib/intel64"
- "${MKLROOT}/lib"
- REQUIRED)
+ target_include_directories(regenie PUBLIC ${MKLROOT}/include/)
+ find_library(MKL_LP64_LIB mkl_intel_lp64
+ HINTS "${MKLROOT}/lib/intel64"
+ "${MKLROOT}/lib"
+ REQUIRED
+ )
+ if("${UNAME_S}" STREQUAL "Linux")
find_library(MKL_THREAD_LIB mkl_gnu_thread
- PATHS "${MKLROOT}/lib/intel64"
+ HINTS "${MKLROOT}/lib/intel64"
"${MKLROOT}/lib"
- REQUIRED)
- find_library(MKL_CORE_LIB mkl_core
- PATHS "${MKLROOT}/lib/intel64"
+ REQUIRED
+ )
+ elseif("${UNAME_S}" STREQUAL "Darwin")
+ find_library(MKL_THREAD_LIB mkl_intel_thread
+ HINTS "${MKLROOT}/lib/intel64"
"${MKLROOT}/lib"
- REQUIRED)
- target_link_libraries(regenie PRIVATE "-Wl,--no-as-needed" ${MKL_LP64_LIB} ${MKL_THREAD_LIB} ${MKL_CORE_LIB} -lgomp)
+ REQUIRED
+ )
+ endif()
+ find_library(MKL_CORE_LIB mkl_core
+ HINTS "${MKLROOT}/lib/intel64"
+ "${MKLROOT}/lib"
+ REQUIRED
+ )
+ if("${UNAME_S}" STREQUAL "Darwin")
+ target_link_libraries(regenie ${MKL_LP64_LIB} ${MKL_THREAD_LIB} ${MKL_CORE_LIB})
+ elseif(${BUILD_STATIC})
+ target_link_libraries(regenie "-Wl,--start-group" ${MKL_LP64_LIB} ${MKL_THREAD_LIB} ${MKL_CORE_LIB} "-Wl,--end-group" -lgomp)
+ else() # use dynamic libs
+ target_link_libraries(regenie "-Wl,--no-as-needed" ${MKL_LP64_LIB} ${MKL_THREAD_LIB} ${MKL_CORE_LIB} -lgomp)
endif()
-elseif(EXISTS ${OPENBLAS_ROOT}) # OpenBLAS
- add_definitions(-DWITH_OPENBLAS -DEIGEN_USE_BLAS -DEIGEN_USE_LAPACKE)
- target_include_directories(regenie PRIVATE ${OPENBLAS_ROOT}/include/)
- find_library(LAPACK_LIB lapack REQUIRED)
- find_library(BLAS_LIB openblas HINTS "${OPENBLAS_ROOT}/lib/" REQUIRED)
- target_link_libraries(regenie PRIVATE ${LAPACK_LIB} -llapacke ${BLAS_LIB})
+ message( STATUS "Will compile with Intel MKL library")
endif()

# cxxopts (header-only)
-target_include_directories(regenie PRIVATE ${EXTERN_LIBS_PATH}/cxxopts/include/)
+target_include_directories(regenie PUBLIC ${CMAKE_SOURCE_DIR}/external_libs/cxxopts/include/)

# LBFGS (header-only)
-target_include_directories(regenie PRIVATE ${EXTERN_LIBS_PATH}/LBFGSpp/include/)
+target_include_directories(regenie PUBLIC ${CMAKE_SOURCE_DIR}/external_libs/LBFGSpp/include/)

# Eigen (header-only)
-target_include_directories(regenie PRIVATE ${EXTERN_LIBS_PATH}/eigen-3.4.0/)
-
-# Boost IO
-if(${HAS_BOOST_IOSTREAM})
- if("${UNAME_S}" STREQUAL "Darwin")
- find_library(BOOST_LIB_IO libboost_iostreams libboost_iostreams.a REQUIRED)
- target_link_libraries(regenie PRIVATE ${BOOST_LIB_IO})
- elseif(${BUILD_STATIC})
- find_library(BOOST_LIB_IO libboost_iostreams.a REQUIRED)
- target_link_libraries(regenie PRIVATE ${BOOST_LIB_IO})
- else()
- target_link_libraries(regenie PRIVATE -lboost_iostreams)
- endif()
- add_definitions(-DHAS_BOOST_IOSTREAM)
- message( STATUS "Will compile with Boost Iostreams library")
-endif()
+target_include_directories(regenie PUBLIC ${CMAKE_SOURCE_DIR}/external_libs/eigen-3.4.0/)

# Other libraries
-find_library(ZLIB_LIBRARY libz.a z REQUIRED)
-find_library(M_LIB m REQUIRED)
-find_library(DL_LIB dl REQUIRED)
+find_library(ZLIB_LIBRARY z REQUIRED)
+find_library(M_LIB m REQUIRED)
+find_library(DL_LIB dl REQUIRED)
if("${UNAME_S}" STREQUAL "Linux")
set(GFORTRAN_LIBRARY "-lgfortran")
elseif("${UNAME_S}" STREQUAL "Darwin")
find_library(GFORTRAN_LIBRARY gfortran REQUIRED)
endif()
-target_link_libraries(
- regenie PRIVATE
- ${ZLIB_LIBRARY} ${M_LIB} ${DL_LIB} ${PTHREAD_LIB}
- ${GFORTRAN_LIBRARY}
-)
+target_link_libraries(regenie ${ZLIB_LIBRARY} ${M_LIB} ${DL_LIB} ${PTHREAD_LIB} ${GFORTRAN_LIBRARY})

-install(TARGETS regenie RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+add_definitions(-DVERSION_NUMBER="${RG_VERSION}")
+install(TARGETS regenie RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} OPTIONAL)
message( STATUS "REGENIE v" ${RG_VERSION})

-add_custom_target(full-clean
- COMMAND cd "${MVTN_PATH}" && make clean
- COMMAND cd "${QF_PATH}" && make clean
- COMMAND cd "${QUAD_PATH}" && make clean
- COMMAND cd "${PGEN_PATH}" && make clean
- )
+write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake COMPATIBILITY SameMajorVersion)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake DESTINATION share/${PROJECT_NAME})
+
+set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+include(CPack)
--
2.34.1

Loading