@@ -23,9 +23,8 @@ set(NCBI_PTBCFG_ENABLE_COLLECTOR ON)
23
23
#set(NCBI_PTBCFG_ALLOW_COMPOSITE OFF)
24
24
#set(NCBI_PTBCFG_ADDTEST OFF)
25
25
#set(NCBI_PTBCFG_NCBI_BUILD_FLAGS OFF)
26
- if (NOT DEFINED NCBI_PTBCFG_USELOCAL )
27
- set (NCBI_PTBCFG_USELOCAL ON )
28
- endif ()
26
+ #set(NCBI_PTBCFG_USELOCAL OFF)
27
+
29
28
get_filename_component (NCBI_PTBCFG_PACKAGELIST "${CMAKE_CURRENT_LIST_DIR} /../../.." ABSOLUTE )
30
29
get_filename_component (NCBI_PTBCFG_PACKAGEROOT "${NCBI_PTBCFG_PACKAGELIST} /.." ABSOLUTE )
31
30
@@ -45,16 +44,14 @@ endif()
45
44
macro (NCBIptb_setup )
46
45
set (_listdir "${NCBI_TREE_CMAKECFG} " )
47
46
48
- set (_options "NCBI_BUILD_FLAGS;-NCBI_BUILD_FLAGS" )
49
- set (_options "${_options} ;NCBI_CTEST;-NCBI_CTEST" )
50
- set (_options "${_options} ;NCBI_LOCAL_COMPONENTS;-NCBI_LOCAL_COMPONENTS" )
47
+ set (_options "NCBI_BUILD_FLAGS;NCBI_CTEST;NCBI_LOCAL_COMPONENTS" )
51
48
set (_keys "COMPONENTS;FEATURES" )
52
49
foreach (_arg IN ITEMS ${ARGN} )
53
50
if ("${_arg} " IN_LIST _keys )
54
51
break ()
55
52
endif ()
56
53
if (NOT "${_arg} " IN_LIST _options )
57
- message (FATAL_ERROR "ERROR: Unknown configuration option: ${_arg} (must one of ${_options} )" )
54
+ message (FATAL_ERROR "ERROR: Unknown configuration option: ${_arg} (must be one of ${_options} )" )
58
55
endif ()
59
56
endforeach ()
60
57
cmake_parse_arguments (CFG "${_options} " "" "${_keys} " ${ARGN} )
@@ -75,9 +72,6 @@ macro(NCBIptb_setup)
75
72
if (CFG_NCBI_LOCAL_COMPONENTS )
76
73
set (NCBI_PTBCFG_USELOCAL ON )
77
74
endif ()
78
- if (CFG_-NCBI_LOCAL_COMPONENTS )
79
- set (NCBI_PTBCFG_USELOCAL OFF )
80
- endif ()
81
75
list (APPEND NCBI_PTBCFG_PROJECT_COMPONENTS ${CFG_COMPONENTS} )
82
76
83
77
include (${_listdir} /CMake.NCBIComponents.cmake )
0 commit comments