skip columnar, skip secondary

Locate both in one place

cmake/GetColumnar.cmake

@@ -55,8 +55,6 @@ find_package ( columnar ${COLUMNAR_REQUIRED_VER} COMPONENTS columnar_api CONFIG
 return_if_columnar_api_found ()
 
 # Not found. get columnar src, extract columnar_api.
-set ( SKIP_COLUMNAR TRUE ) # that will cause columnar NOT to build, only columnar_api
-
 if (DEFINED ENV{COLUMNAR_LOCATOR})
 	set ( COLUMNAR_LOCATOR $ENV{COLUMNAR_LOCATOR} )
 elseif (EXISTS "${MANTICORE_SOURCE_DIR}/local_columnar_src.txt")

cmake/columnar-imported.cmake.in

@@ -5,7 +5,7 @@ project ( columnar-api-build NONE )
 include ( ExternalProject )
 ExternalProject_Add ( columnar_api_populate
 		${COLUMNAR_LOCATOR}
-		CMAKE_ARGS -DSKIP_COLUMNAR=${SKIP_COLUMNAR}
+		CMAKE_ARGS -DSKIP_COLUMNAR=1 -DSKIP_SECONDARY=1
 		BUILD_COMMAND "${CMAKE_COMMAND}" --build . --config RelWithDebInfo
 		INSTALL_COMMAND "${CMAKE_COMMAND}" --install . --config RelWithDebInfo --prefix "${COLUMNAR_BUILD}"
 		)