From ef016d3bb5c8ce32bbe8ffdf3dd8ef2221eaf04d Mon Sep 17 00:00:00 2001
From: Gabriel Studer <gabriel.studer@unibas.ch>
Date: Wed, 6 Mar 2019 00:06:54 +0100
Subject: [PATCH] cmake cosmetics
---
modules/bindings/CMakeLists.txt | 4 ++--
modules/bindings/pymod/CMakeLists.txt | 2 +-
modules/bindings/src/CMakeLists.txt | 5 +----
modules/db/src/CMakeLists.txt | 3 ++-
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/modules/bindings/CMakeLists.txt b/modules/bindings/CMakeLists.txt
index cf7db3225..1d4f1f9f1 100644
--- a/modules/bindings/CMakeLists.txt
+++ b/modules/bindings/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_subdirectory(pymod)
+add_subdirectory(src)
add_subdirectory(tests)
-add_subdirectory(src)
\ No newline at end of file
+add_subdirectory(pymod)
diff --git a/modules/bindings/pymod/CMakeLists.txt b/modules/bindings/pymod/CMakeLists.txt
index 5d91e8906..468151bc5 100644
--- a/modules/bindings/pymod/CMakeLists.txt
+++ b/modules/bindings/pymod/CMakeLists.txt
@@ -21,6 +21,6 @@ set(OST_BINDINGS_PYMOD_SOURCES
wrap_bindings.cc
)
-
pymod(NAME bindings OUTPUT_DIR ost/bindings CPP ${OST_BINDINGS_PYMOD_SOURCES}
PY ${OST_BINDINGS})
+
diff --git a/modules/bindings/src/CMakeLists.txt b/modules/bindings/src/CMakeLists.txt
index e5988958a..2ae1b882d 100644
--- a/modules/bindings/src/CMakeLists.txt
+++ b/modules/bindings/src/CMakeLists.txt
@@ -4,8 +4,6 @@ if (COMPILE_TMTOOLS)
executable(NAME tmscore SOURCES tmscore.f)
endif()
-add_subdirectory(tmalign)
-
set(OST_BINDINGS_SOURCES
wrap_tmalign.cc)
@@ -13,6 +11,5 @@ set(OST_BINDINGS_HEADERS
wrap_tmalign.hh)
module(NAME bindings SOURCES ${OST_BINDINGS_SOURCES}
- HEADERS ${OST_BINDINGS_TMALIGN_HEADERS} IN_DIR tmalign
- ${OST_BINDINGS_HEADERS} HEADER_OUTPUT_DIR ost/bindings
+ HEADERS ${OST_BINDINGS_HEADERS} HEADER_OUTPUT_DIR ost/bindings
DEPENDS_ON ost_geom ost_mol ost_seq)
diff --git a/modules/db/src/CMakeLists.txt b/modules/db/src/CMakeLists.txt
index 77bc7829f..2e85478c4 100644
--- a/modules/db/src/CMakeLists.txt
+++ b/modules/db/src/CMakeLists.txt
@@ -16,10 +16,11 @@ extract_data_helper.cc
)
module(NAME db SOURCES ${OST_DB_SOURCES} HEADERS ${OST_DB_HEADERS}
- DEPENDS_ON ost_base ost_geom ost_seq sqlite3)
+ DEPENDS_ON ost_base ost_geom ost_seq LINK sqlite3)
if(WIN32)
set_target_properties(ost_db PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/sqlite3.def")
add_definitions(/DSQLITE_ENABLE_COLUMN_METADATA)
else(WIN32)
add_definitions(-DSQLITE_OMIT_LOAD_EXTENSION)
endif(WIN32)
+
--
GitLab