diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9de5427..08a48ad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -80,6 +80,7 @@ if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
   else()
     conan_basic_setup()
   endif()
+  conan_define_targets()
 endif()
 
 # Set reasonably strict warning options for clang, gcc, msvc
diff --git a/src/cmake/modules/FindOpenSSL.cmake b/src/cmake/modules/FindOpenSSL.cmake
new file mode 100644
index 0000000..402bd72
--- /dev/null
+++ b/src/cmake/modules/FindOpenSSL.cmake
@@ -0,0 +1,34 @@
+#
+# Copyright(c) 2006 to 2018 ADLINK Technology Limited and others
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v. 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0, or the Eclipse Distribution License
+# v. 1.0 which is available at
+# http://www.eclipse.org/org/documents/edl-v10.php.
+#
+# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
+#
+if(TARGET CONAN_PKG::OpenSSL)
+  add_library(OpenSSL INTERFACE IMPORTED) #ALIAS CONAN_PKG::OpenSSL)
+  target_link_libraries(OpenSSL INTERFACE CONAN_PKG::OpenSSL)
+  set(OPENSSL_FOUND TRUE)
+else()
+  # Loop over a list of possible module paths (without the current directory).
+  get_filename_component(DIR "${CMAKE_CURRENT_LIST_DIR}" ABSOLUTE)
+
+  foreach(MODULE_DIR ${CMAKE_MODULE_PATH} ${CMAKE_ROOT}/Modules)
+    get_filename_component(MODULE_DIR "${MODULE_DIR}" ABSOLUTE)
+    if(NOT MODULE_DIR STREQUAL DIR)
+      if(EXISTS "${MODULE_DIR}/FindOpenSSL.cmake")
+        set(FIND_PACKAGE_FILE "${MODULE_DIR}/FindOpenSSL.cmake")
+        break()
+      endif()
+    endif()
+  endforeach()
+
+  if(FIND_PACKAGE_FILE)
+    include("${FIND_PACKAGE_FILE}")
+  endif()
+endif()
+
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index a1af207..88993b5 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -36,9 +36,7 @@ add_definitions(-DDDSI_INCLUDE_NETWORK_PARTITIONS -DDDSI_INCLUDE_SSM)
 find_package(OpenSSL)
 if(OPENSSL_FOUND)
   add_definitions(-DDDSI_INCLUDE_SSL)
-  include_directories(${OPENSSL_INCLUDE_DIR})
-  target_link_libraries(ddsc PRIVATE ${OPENSSL_LIBRARIES})
-  message(STATUS "Using OpenSSL ${OPENSSL_VERSION} at ${OPENSSL_INCLUDE_DIR}")
+  target_link_libraries(ddsc PRIVATE OpenSSL)
 endif()
 
 include(ddsi/CMakeLists.txt)