From d90c7d4279be70b5bc961c0167b847e691eda449 Mon Sep 17 00:00:00 2001 From: IMFTool Date: Wed, 17 Nov 2021 09:37:11 +0100 Subject: CMake fix --- src/CMakeLists.txt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 54094d2..11c13e7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,7 @@ endif (NOT WITHOUT_XML) set(UseRandomUUID OFF CACHE BOOL "") -if (OpenSSLLib_PATH AND OpenSSLLib_include_DIR) +if (NOT WITHOUT_SSL AND OpenSSLLib_PATH AND OpenSSLLib_include_DIR) set (HAVE_OPENSSL 1) message(STATUS "Building with encryption support") add_definitions(/DHAVE_OPENSSL=1) @@ -100,7 +100,7 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}") if (HAVE_OPENSSL) include_directories("${OpenSSLLib_include_DIR}") endif() -if (WITH_XERCES) +if (HAVE_XERCES_C) include_directories("${XercescppLib_include_DIR}") add_definitions(/DHAVE_XERCES_C=1) endif() @@ -243,8 +243,16 @@ if(WIN32) target_link_libraries(as-02-info general Advapi32.lib) endif(WIN32) +set (install_includes) +if (HAVE_OPENSSL) + list(APPEND install_includes "${OpenSSLLib_include_DIR}") +endif() + +if (HAVE_XERCES_C) + list(APPEND install_includes "${XercescppLib_include_DIR}") +endif() # add the install target -install(TARGETS libkumu libasdcp libas02 EXPORT asdcplibtargets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib INCLUDES DESTINATION "${OpenSSLLib_include_DIR}" "${XercescppLib_include_DIR}") +install(TARGETS libkumu libasdcp libas02 EXPORT asdcplibtargets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib INCLUDES DESTINATION "${install_includes}") set(install_targets blackwave wavesplit klvwalk asdcp-test asdcp-wrap asdcp-unwrap asdcp-info asdcp-util j2c-test as-02-wrap as-02-wrap-iab as-02-unwrap as-02-info kmfilegen kmuuidgen kmrandgen) -- cgit v1.2.3