From 711aad8c17a066540aabc3551f087698d2c61d30 Mon Sep 17 00:00:00 2001 From: Cameron Gilchrist Date: Thu, 23 Nov 2023 14:54:21 +0900 Subject: [PATCH] Squashed 'lib/foldseek/' changes from e1370886..e00a3dc1 e00a3dc1 Three more fixes to make foldseek subproject possible git-subtree-dir: lib/foldseek git-subtree-split: e00a3dc172b0edf61f6555779a9b984605bab0f3 --- CMakeLists.txt | 2 +- lib/3di/CMakeLists.txt | 7 +++++-- src/commons/LocalParameters.h | 2 -- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2153b46..cd4b173 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ set(FRAMEWORK_ONLY 1 CACHE INTERNAL "" FORCE) include(MMseqsSetupDerivedTarget) add_subdirectory(lib/mmseqs EXCLUDE_FROM_ALL) -set(FOLDSEEK_FRAMEWORK_ONLY 0 CACHE INTERNAL "" FORCE) +set(FOLDSEEK_FRAMEWORK_ONLY 0 CACHE BOOL "Framework mode (don't create foldseek executable)") if (FOLDSEEK_FRAMEWORK_ONLY) set(FRAMEWORK_ONLY 1 CACHE INTERNAL "" FORCE) endif() diff --git a/lib/3di/CMakeLists.txt b/lib/3di/CMakeLists.txt index b073166..608212d 100644 --- a/lib/3di/CMakeLists.txt +++ b/lib/3di/CMakeLists.txt @@ -5,6 +5,9 @@ add_library(3di structureto3diseqdist.cpp ) mmseqs_setup_derived_target(3di) - -target_include_directories(3di PRIVATE ..) # needed for kerasify/keras_model.h +target_include_directories(3di + PRIVATE + .. # kerasify/keras_model.h + ${PROJECT_BINARY_DIR}/generated # encoder_weights_3di.kerasify.h +) add_dependencies(3di local-generated) diff --git a/src/commons/LocalParameters.h b/src/commons/LocalParameters.h index 56d2649..2a0ead6 100644 --- a/src/commons/LocalParameters.h +++ b/src/commons/LocalParameters.h @@ -134,9 +134,7 @@ class LocalParameters : public Parameters { private: - LocalParameters(LocalParameters const&); - ~LocalParameters() {}; void operator=(LocalParameters const&); }; #endif