Skip to content
Snippets Groups Projects
Commit ef016d3b authored by Studer Gabriel's avatar Studer Gabriel
Browse files

cmake cosmetics

parent e92657fd
No related branches found
No related tags found
No related merge requests found
add_subdirectory(pymod) add_subdirectory(src)
add_subdirectory(tests) add_subdirectory(tests)
add_subdirectory(src) add_subdirectory(pymod)
\ No newline at end of file
...@@ -21,6 +21,6 @@ set(OST_BINDINGS_PYMOD_SOURCES ...@@ -21,6 +21,6 @@ set(OST_BINDINGS_PYMOD_SOURCES
wrap_bindings.cc wrap_bindings.cc
) )
pymod(NAME bindings OUTPUT_DIR ost/bindings CPP ${OST_BINDINGS_PYMOD_SOURCES} pymod(NAME bindings OUTPUT_DIR ost/bindings CPP ${OST_BINDINGS_PYMOD_SOURCES}
PY ${OST_BINDINGS}) PY ${OST_BINDINGS})
...@@ -4,8 +4,6 @@ if (COMPILE_TMTOOLS) ...@@ -4,8 +4,6 @@ if (COMPILE_TMTOOLS)
executable(NAME tmscore SOURCES tmscore.f) executable(NAME tmscore SOURCES tmscore.f)
endif() endif()
add_subdirectory(tmalign)
set(OST_BINDINGS_SOURCES set(OST_BINDINGS_SOURCES
wrap_tmalign.cc) wrap_tmalign.cc)
...@@ -13,6 +11,5 @@ set(OST_BINDINGS_HEADERS ...@@ -13,6 +11,5 @@ set(OST_BINDINGS_HEADERS
wrap_tmalign.hh) wrap_tmalign.hh)
module(NAME bindings SOURCES ${OST_BINDINGS_SOURCES} module(NAME bindings SOURCES ${OST_BINDINGS_SOURCES}
HEADERS ${OST_BINDINGS_TMALIGN_HEADERS} IN_DIR tmalign HEADERS ${OST_BINDINGS_HEADERS} HEADER_OUTPUT_DIR ost/bindings
${OST_BINDINGS_HEADERS} HEADER_OUTPUT_DIR ost/bindings
DEPENDS_ON ost_geom ost_mol ost_seq) DEPENDS_ON ost_geom ost_mol ost_seq)
...@@ -16,10 +16,11 @@ extract_data_helper.cc ...@@ -16,10 +16,11 @@ extract_data_helper.cc
) )
module(NAME db SOURCES ${OST_DB_SOURCES} HEADERS ${OST_DB_HEADERS} 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) if(WIN32)
set_target_properties(ost_db PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/sqlite3.def") set_target_properties(ost_db PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/sqlite3.def")
add_definitions(/DSQLITE_ENABLE_COLUMN_METADATA) add_definitions(/DSQLITE_ENABLE_COLUMN_METADATA)
else(WIN32) else(WIN32)
add_definitions(-DSQLITE_OMIT_LOAD_EXTENSION) add_definitions(-DSQLITE_OMIT_LOAD_EXTENSION)
endif(WIN32) endif(WIN32)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment