diff options
| author | John Hurst <jhurst@cinecert.com> | 2021-11-17 09:49:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-17 09:49:26 -0800 |
| commit | 867e53bc8dcc7af12342b5ea2bde2cc888b94c68 (patch) | |
| tree | 85701140f5f768c8dc72acd10c0f962c23d19ba1 /src | |
| parent | b1332326d7ff9c046edb5fd3bd0d3e882a9aa4b8 (diff) | |
| parent | d90c7d4279be70b5bc961c0167b847e691eda449 (diff) | |
Merge pull request #103 from IMFTool/cmake-fix
CMake fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 14 |
1 files changed, 11 insertions, 3 deletions
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)
|