Skip to content

Commit 6cb8cbd

Browse files
committed
Fix redistribution of Easel headers in CMakeLists.txt
1 parent 57ce478 commit 6cb8cbd

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

src/CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
include(Destatic)
2-
3-
file(COPY ../vendor/hmmer DESTINATION .)
4-
file(COPY ./hmmer DESTINATION .)
5-
destatic(../vendor/hmmer/src/p7_hmmfile.c ${CMAKE_CURRENT_BINARY_DIR}/hmmer/src/p7_hmmfile.full.c)
6-
71
add_subdirectory(easel)
8-
# add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/easel ${CMAKE_CURRENT_BINARY_DIR}/easel/build)
9-
add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/hmmer ${CMAKE_CURRENT_BINARY_DIR}/hmmer/build)
2+
add_subdirectory(hmmer)
103
add_subdirectory(pyhmmer)

src/easel/CMakeLists.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,6 @@ message(DEBUG "-- Dumping esl_config.h --")
4848
message(DEBUG "${ESL_CONFIG_H}")
4949
message(DEBUG "-- End esl_config.h --")
5050

51-
set(EASEL_PATCHED_SOURCES
52-
${EASEL_PATCHED_SOURCES}
53-
${CMAKE_CURRENT_BINARY_DIR}/esl_config.h
54-
)
55-
5651
# --- Manually declare required sources only -----------------------------------
5752

5853
set(EASEL_SOURCE_DIR
@@ -238,6 +233,10 @@ set(EASEL_HEADERS
238233
interface_lapack.h
239234
)
240235

236+
set(EASEL_PATCHED_SOURCES
237+
${CMAKE_CURRENT_BINARY_DIR}/esl_config.h
238+
)
239+
241240
# --- Copy/patch source files if needed ----------------------------------------
242241

243242
foreach(_file IN ITEMS ${EASEL_SOURCES} ${EASEL_HEADERS})
@@ -299,7 +298,7 @@ if(DEFINED PYHMMER_INSTALL_LIBS_DIR)
299298
install(TARGETS libeasel DESTINATION "${SKBUILD_PLATLIB_DIR}/${PYHMMER_INSTALL_LIBS_DIR}")
300299
set_target_properties(libeasel PROPERTIES INSTALL_RPATH "\$ORIGIN/.")
301300
cmake_path(APPEND SKBUILD_PLATLIB_DIR "${PYHMMER_INSTALL_LIBS_DIR}" "include" "libeasel" OUTPUT_VARIABLE INCLUDE_DEST_FOLDER)
302-
foreach(_file IN ITEMS ${INFERNAL_PATCHED_SOURCES})
301+
foreach(_file IN ITEMS ${EASEL_PATCHED_SOURCES})
303302
cmake_path(GET _file EXTENSION LAST_ONLY _ext)
304303
if(_ext STREQUAL ".h")
305304
cmake_path(RELATIVE_PATH _file BASE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" OUTPUT_VARIABLE _local)

0 commit comments

Comments
 (0)