Skip to content

Commit 711aad8

Browse files
committed
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
1 parent 78ec228 commit 711aad8

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ set(FRAMEWORK_ONLY 1 CACHE INTERNAL "" FORCE)
1616
include(MMseqsSetupDerivedTarget)
1717
add_subdirectory(lib/mmseqs EXCLUDE_FROM_ALL)
1818

19-
set(FOLDSEEK_FRAMEWORK_ONLY 0 CACHE INTERNAL "" FORCE)
19+
set(FOLDSEEK_FRAMEWORK_ONLY 0 CACHE BOOL "Framework mode (don't create foldseek executable)")
2020
if (FOLDSEEK_FRAMEWORK_ONLY)
2121
set(FRAMEWORK_ONLY 1 CACHE INTERNAL "" FORCE)
2222
endif()

lib/3di/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ add_library(3di
55
structureto3diseqdist.cpp
66
)
77
mmseqs_setup_derived_target(3di)
8-
9-
target_include_directories(3di PRIVATE ..) # needed for kerasify/keras_model.h
8+
target_include_directories(3di
9+
PRIVATE
10+
.. # kerasify/keras_model.h
11+
${PROJECT_BINARY_DIR}/generated # encoder_weights_3di.kerasify.h
12+
)
1013
add_dependencies(3di local-generated)

src/commons/LocalParameters.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@ class LocalParameters : public Parameters {
134134

135135

136136
private:
137-
138137
LocalParameters(LocalParameters const&);
139-
~LocalParameters() {};
140138
void operator=(LocalParameters const&);
141139
};
142140
#endif

0 commit comments

Comments
 (0)