Skip to content

Commit 1f8d1f6

Browse files
committed
Modified configuration options arguments into NCBIptb_setup. JIRA: CXX-14024
git-svn-id: https://anonsvn.ncbi.nlm.nih.gov/repos/v1/trunk/c++@104477 78c7ea69-d796-4a43-9a09-de51944f1b03
1 parent c7391aa commit 1f8d1f6

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

src/build-system/cmake/CMake.NCBIpkg.conan.cmake

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ set(NCBI_PTBCFG_ENABLE_COLLECTOR ON)
2323
#set(NCBI_PTBCFG_ALLOW_COMPOSITE OFF)
2424
#set(NCBI_PTBCFG_ADDTEST OFF)
2525
#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+
2928
get_filename_component(NCBI_PTBCFG_PACKAGELIST "${CMAKE_CURRENT_LIST_DIR}/../../.." ABSOLUTE)
3029
get_filename_component(NCBI_PTBCFG_PACKAGEROOT "${NCBI_PTBCFG_PACKAGELIST}/.." ABSOLUTE)
3130

@@ -45,16 +44,14 @@ endif()
4544
macro(NCBIptb_setup)
4645
set(_listdir "${NCBI_TREE_CMAKECFG}")
4746

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")
5148
set(_keys "COMPONENTS;FEATURES")
5249
foreach(_arg IN ITEMS ${ARGN})
5350
if("${_arg}" IN_LIST _keys)
5451
break()
5552
endif()
5653
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})")
5855
endif()
5956
endforeach()
6057
cmake_parse_arguments(CFG "${_options}" "" "${_keys}" ${ARGN})
@@ -75,9 +72,6 @@ macro(NCBIptb_setup)
7572
if(CFG_NCBI_LOCAL_COMPONENTS)
7673
set(NCBI_PTBCFG_USELOCAL ON)
7774
endif()
78-
if(CFG_-NCBI_LOCAL_COMPONENTS)
79-
set(NCBI_PTBCFG_USELOCAL OFF)
80-
endif()
8175
list(APPEND NCBI_PTBCFG_PROJECT_COMPONENTS ${CFG_COMPONENTS})
8276

8377
include(${_listdir}/CMake.NCBIComponents.cmake)

0 commit comments

Comments
 (0)