CMakeLists.txt,Makefile_src,cmpossl/libsecutils: make use of various_…

…CMake_tweaks in submodules

CMakeLists.txt

@@ -47,7 +47,6 @@ endif()
 
 include_directories(
   ${INC_DIR}
-  ${PROJECT_SOURCE_DIR}/libsecutils/include
 )
 if(DEFINED USE_LIBCMP)
   include_directories(SYSTEM ${CMPOSSL_INC_DIR}/cmp)
@@ -71,7 +70,7 @@ add_executable(cmpClient
 
 target_link_libraries(cmpClient
   ${LIBGENCMP_NAME}
-  secutils
+  security-utilities::library
 )
 if(DEFINED USE_LIBCMP)
   target_link_libraries(cmpClient
@@ -131,7 +130,7 @@ if(DEFINED USE_LIBCMP)
   target_link_libraries(${LIBGENCMP_NAME} cmp)
 endif()
 # important: place libcmp before libcrypto such that its contents are preferred
-target_link_libraries(${LIBGENCMP_NAME} ${OPENSSL_LIBRARIES} secutils) # needed for clang/MacOSX
+target_link_libraries(${LIBGENCMP_NAME} OpenSSL::Crypto OpenSSL::SSL security-utilities::library)
 
 set(INC_PUBLIC_HDRS
   ${INC_DIR}/genericCMPClient.h

Makefile_src

@@ -101,7 +101,7 @@ override CFLAGS += \
 override CFLAGS +=-Wno-c99-extensions -Wno-language-extension-token -Wno-declaration-after-statement \
   -Wno-sign-conversion -Wno-shorten-64-to-32 -Wno-shadow # due to libsecutils
 ifeq ($(LPATH),)
-   override CFLAGS += -I$(SECUTILS_DIR)/include
+   override CFLAGS += -I$(SECUTILS_DIR)/src/libsecutils/include
 endif
 ifneq ($(LIBCMP_INC),)
     ifeq ($(DEB_TARGET_ARCH),) # not during Debian packaging