diff --git a/modules/bindings/CMakeLists.txt b/modules/bindings/CMakeLists.txt index cf7db32255f81caf33d038075ff8acd63d86a4e7..1d4f1f9f1164f556a06f2ca74ad3699f49436adf 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 5d91e8906245dddbc3f6c5c2d17066e695a84051..468151bc5c2d0314a80efd525e8b9a243c721d35 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 e5988958a9b5a4d5e0418091d36ec98579afaaf1..2ae1b882de59efa1ccb99947d4c7c44c99678098 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 77bc7829f9afafbfdc2228c8da42fff204e92046..2e85478c49197df7b8682007c52a8ddb6acc0d22 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) +