Skip to content

Commit 3b55088

Browse files
committed
protein stuff is now only on with -DUSE_CMAPLE_AA=ON
1 parent 0091941 commit 3b55088

File tree

5 files changed

+59
-42
lines changed

5 files changed

+59
-42
lines changed

CMakeLists.txt

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ include_directories("${PROJECT_BINARY_DIR}")
246246
#include_directories("${PROJECT_BINARY_DIR}/zlib-1.2.7")
247247

248248

249-
if (NOT CMAPLE_FLAGS MATCHES "nozlib")
249+
if (NOT CMAPLE_FLAGS MATCHES "nozlib" AND NOT CMAPLE_FLAGS MATCHES "static")
250250
find_package(ZLIB)
251251
endif()
252252

@@ -300,28 +300,35 @@ add_subdirectory(unittest)
300300
# the main executable
301301
##################################################################
302302
add_executable(cmaple main/main.cpp)
303-
add_executable(cmaple-aa main/main.cpp)
303+
if (USE_CMAPLE_AA)
304+
add_executable(cmaple-aa main/main.cpp)
305+
endif()
304306

305307
if(Backtrace_FOUND)
306308
include_directories(${Backtrace_INCLUDE_DIR})
307309
target_link_libraries(cmaple PRIVATE ${Backtrace_LIBRARY})
308-
target_link_libraries(cmaple-aa PRIVATE ${Backtrace_LIBRARY})
310+
if (USE_CMAPLE_AA)
311+
target_link_libraries(cmaple-aa PRIVATE ${Backtrace_LIBRARY})
312+
endif()
309313
endif(Backtrace_FOUND)
310314

311315
##################################################################
312316
# setup linking flags
313317
##################################################################
314318

315319
target_link_libraries(cmaple PUBLIC maple cmaple_tree cmaple_alignment cmaple_model ncl nclextra cmaple_utils)
316-
target_link_libraries(cmaple-aa PUBLIC maple-aa cmaple_tree-aa cmaple_alignment-aa cmaple_model-aa ncl nclextra cmaple_utils)
317-
320+
if (USE_CMAPLE_AA)
321+
target_link_libraries(cmaple-aa PUBLIC maple-aa cmaple_tree-aa cmaple_alignment-aa cmaple_model-aa ncl nclextra cmaple_utils)
322+
endif()
318323

319324
##############################################################
320325
# add the install targets
321326
##############################################################
322327
if (INSTALL_CMAPLE)
323328
install (TARGETS cmaple DESTINATION bin)
324-
install (TARGETS cmaple-aa DESTINATION bin)
329+
if (USE_CMAPLE_AA)
330+
install (TARGETS cmaple-aa DESTINATION bin)
331+
endif()
325332
install (FILES "${PROJECT_SOURCE_DIR}/example/example.maple" DESTINATION .)
326333
install (FILES "${PROJECT_SOURCE_DIR}/example/tree.nwk" DESTINATION .)
327334
#install (FILES "${PROJECT_BINARY_DIR}/cmaple_config.h" DESTINATION "include")
@@ -333,7 +340,9 @@ if (INSTALL_CMAPLE)
333340

334341
if (WIN32)
335342
install (FILES "${BINARY_DIR}/cmaple${EXE_SUFFIX}-click.exe" DESTINATION bin)
336-
install (FILES "${BINARY_DIR}/cmaple-aa${EXE_SUFFIX}-click.exe" DESTINATION bin)
343+
if (USE_CMAPLE_AA)
344+
install (FILES "${BINARY_DIR}/cmaple-aa${EXE_SUFFIX}-click.exe" DESTINATION bin)
345+
endif()
337346
endif()
338347
endif()
339348

alignment/CMakeLists.txt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ alignment.h alignment.cpp
99
target_compile_definitions(cmaple_alignment PUBLIC NUM_STATES=4)
1010
target_link_libraries(cmaple_alignment cmaple_utils)
1111

12-
# Protein data
13-
add_library(cmaple_alignment-aa
14-
mutation.h mutation.cpp
15-
seqregion.h seqregion.cpp
16-
seqregions.h seqregions.cpp
17-
sequence.h sequence.cpp
18-
alignment.h alignment.cpp
19-
)
20-
target_compile_definitions(cmaple_alignment-aa PUBLIC NUM_STATES=20)
21-
target_link_libraries(cmaple_alignment-aa cmaple_utils)
12+
if (USE_CMAPLE_AA)
13+
# Protein data
14+
add_library(cmaple_alignment-aa
15+
mutation.h mutation.cpp
16+
seqregion.h seqregion.cpp
17+
seqregions.h seqregions.cpp
18+
sequence.h sequence.cpp
19+
alignment.h alignment.cpp
20+
)
21+
target_compile_definitions(cmaple_alignment-aa PUBLIC NUM_STATES=20)
22+
target_link_libraries(cmaple_alignment-aa cmaple_utils)
23+
endif()

maple/CMakeLists.txt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ cmaple.h cmaple.cpp
44
)
55
target_link_libraries(maple cmaple_tree cmaple_alignment cmaple_model cmaple_utils)
66

7-
# Protein data
8-
add_library(maple-aa
9-
cmaple.h cmaple.cpp
10-
)
11-
target_link_libraries(maple-aa cmaple_tree-aa cmaple_alignment-aa cmaple_model-aa cmaple_utils)
127

8+
if (USE_CMAPLE_AA)
9+
# Protein data
10+
add_library(maple-aa
11+
cmaple.h cmaple.cpp
12+
)
13+
target_link_libraries(maple-aa cmaple_tree-aa cmaple_alignment-aa cmaple_model-aa cmaple_utils)
14+
endif()

model/CMakeLists.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ model_aa.h model_aa.cpp
77
)
88
target_link_libraries(cmaple_model cmaple_alignment cmaple_utils ncl nclextra)
99

10-
# Protein data
11-
add_library(cmaple_model-aa
12-
model.h model.cpp
13-
modelbase.h modelbase.cpp
14-
model_dna.h model_dna.cpp
15-
model_aa.h model_aa.cpp
16-
)
17-
target_link_libraries(cmaple_model-aa cmaple_alignment-aa cmaple_utils ncl nclextra)
10+
if (USE_CMAPLE_AA)
11+
# Protein data
12+
add_library(cmaple_model-aa
13+
model.h model.cpp
14+
modelbase.h modelbase.cpp
15+
model_dna.h model_dna.cpp
16+
model_aa.h model_aa.cpp
17+
)
18+
target_link_libraries(cmaple_model-aa cmaple_alignment-aa cmaple_utils ncl nclextra)
19+
endif()

tree/CMakeLists.txt

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ altbranch.h
1111
)
1212
target_link_libraries(cmaple_tree cmaple_model cmaple_alignment cmaple_utils)
1313

14-
# Protein data
15-
add_library(cmaple_tree-aa
16-
tree.h tree.cpp
17-
rootcandidate.h
18-
updatingnode.h updatingnode.cpp
19-
traversingnode.h traversingnode.cpp
20-
phylonode.h phylonode.cpp
21-
leaf.h
22-
internal.h
23-
altbranch.h
24-
)
25-
target_link_libraries(cmaple_tree-aa cmaple_model-aa cmaple_alignment-aa cmaple_utils)
14+
if (USE_CMAPLE_AA)
15+
# Protein data
16+
add_library(cmaple_tree-aa
17+
tree.h tree.cpp
18+
rootcandidate.h
19+
updatingnode.h updatingnode.cpp
20+
traversingnode.h traversingnode.cpp
21+
phylonode.h phylonode.cpp
22+
leaf.h
23+
internal.h
24+
altbranch.h
25+
)
26+
target_link_libraries(cmaple_tree-aa cmaple_model-aa cmaple_alignment-aa cmaple_utils)
27+
endif()

0 commit comments

Comments
 (0)