CMake fix

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 54094d2f3a0b9afbc987eb7182dff791083d3543..11c13e7dcbca7f7a685063a1a9eddb32c93be9d7 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@ endif (NOT WITHOUT_XML)
 \r
 set(UseRandomUUID OFF CACHE BOOL "")\r
 \r
-if (OpenSSLLib_PATH AND OpenSSLLib_include_DIR)\r
+if (NOT WITHOUT_SSL AND OpenSSLLib_PATH AND OpenSSLLib_include_DIR)\r
        set (HAVE_OPENSSL 1)\r
        message(STATUS "Building with encryption support")\r
        add_definitions(/DHAVE_OPENSSL=1)\r
@@ -100,7 +100,7 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}")
 if (HAVE_OPENSSL)\r
        include_directories("${OpenSSLLib_include_DIR}")\r
 endif()\r
-if (WITH_XERCES)\r
+if (HAVE_XERCES_C)\r
        include_directories("${XercescppLib_include_DIR}")\r
     add_definitions(/DHAVE_XERCES_C=1)\r
 endif()\r
@@ -243,8 +243,16 @@ if(WIN32)
        target_link_libraries(as-02-info general Advapi32.lib)\r
 endif(WIN32)\r
 \r
+set (install_includes)\r
+if (HAVE_OPENSSL)\r
+    list(APPEND install_includes "${OpenSSLLib_include_DIR}")\r
+endif()\r
+\r
+if (HAVE_XERCES_C)\r
+    list(APPEND install_includes "${XercescppLib_include_DIR}")\r
+endif()\r
 # add the install target\r
-install(TARGETS libkumu libasdcp libas02 EXPORT asdcplibtargets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib INCLUDES DESTINATION "${OpenSSLLib_include_DIR}" "${XercescppLib_include_DIR}")\r
+install(TARGETS libkumu libasdcp libas02 EXPORT asdcplibtargets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib INCLUDES DESTINATION "${install_includes}")\r
 \r
 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)\r
 \r