HPCC-20664 Change directory layout and component names

Fix some build errors resulting from previous commit

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

configuration/configmgr/hpcc_support/add_required_instances/CMakeLists.txt

@@ -35,6 +35,6 @@ INCLUDE_DIRECTORIES(
 
 ADD_DEFINITIONS( -D_USRDLL -DCFGSUPPORT_DAFILESRV_LIB)
 HPCC_ADD_LIBRARY( cfgsupport_addrequiredinstances SHARED ${SRCS} )
-TARGET_LINK_LIBRARIES( cfgsupport_addrequiredinstances jlib )
+TARGET_LINK_LIBRARIES( cfgsupport_addrequiredinstances configmgr jlib )
 
 INSTALL ( TARGETS cfgsupport_addrequiredinstances RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )

testing/unittests/CMakeLists.txt

@@ -46,7 +46,7 @@ include_directories (
          ./../../system/security/shared
          ./../../common/deftype
          ./../../system/security/cryptohelper
-         ./../../configuration/config2
+         ./../../configuration/configmgr/configmgrlib
          ${CMAKE_BINARY_DIR}
          ${CMAKE_BINARY_DIR}/oss
     )
@@ -62,7 +62,7 @@ target_link_libraries ( unittests
          dalibase
          deftype
          libbase58
-         config2
+         configmgr
          ${CPPUNIT_LIBRARIES}
     )