|
| 1 | +diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 2 | +index 900f60b05..57ac3da3a 100755 |
| 3 | +--- a/CMakeLists.txt |
| 4 | ++++ b/CMakeLists.txt |
| 5 | +@@ -111,9 +111,10 @@ endif() |
| 6 | + |
| 7 | + if(CMAKE_WPEWEBKIT_JSBINDINGS) |
| 8 | + message("CMAKE_WPEWEBKIT_JSBINDINGS is set, Finding JavaScriptCore") |
| 9 | +- pkg_search_module(PC_WPE_WEBKIT wpe-webkit-deprecated-0.1 wpe-webkit-1.0 wpe-webkit-1.1) |
| 10 | +- find_path (JSC_INCDIR JavaScriptCore/JavaScript.h HINTS ${PC_WPE_WEBKIT_INCLUDEDIR} ${PC_WPE_WEBKIT_INCLUDE_DIRS}) |
| 11 | +- include_directories(${JSC_INCDIR}) |
| 12 | ++# pkg_search_module(PC_WPE_WEBKIT wpe-webkit-deprecated-0.1 wpe-webkit-1.0 wpe-webkit-1.1) |
| 13 | ++# find_path (JSC_INCDIR JavaScriptCore/JavaScript.h HINTS ${PC_WPE_WEBKIT_INCLUDEDIR} ${PC_WPE_WEBKIT_INCLUDE_DIRS}) |
| 14 | ++# include_directories(${JSC_INCDIR}) |
| 15 | ++ include_directories($ENV{EXT_INSTALL_PATH}) |
| 16 | + else() |
| 17 | + message("CMAKE_WPEWEBKIT_JSBINDINGS not set") |
| 18 | + endif() |
| 19 | +@@ -658,7 +659,7 @@ endif() |
| 20 | + if(CMAKE_WPEWEBKIT_JSBINDINGS) |
| 21 | + message("CMAKE_WPEWEBKIT_JSBINDINGS set, creating jsbinding library") |
| 22 | + include_directories(${CMAKE_CURRENT_SOURCE_DIR} jsbindings jsbindings/PersistentWatermark) |
| 23 | +- add_subdirectory(test) |
| 24 | ++# add_subdirectory(test) |
| 25 | + set(JSBINDINGS_STD_SOURCES jsbindings/jscontroller-jsbindings.cpp jsbindings/jsbindings.cpp jsbindings/jsutils.cpp jsbindings/jsmediaplayer.cpp jsbindings/jseventlistener.cpp jsbindings/jsevent.cpp jsbindings/PersistentWatermark/PersistentWatermark.cpp) |
| 26 | + if(CMAKE_WPEWEBKIT_WATERMARK_JSBINDINGS) |
| 27 | + add_library(aampjsbindings SHARED ${JSBINDINGS_STD_SOURCES} jsbindings/PersistentWatermark/PersistentWatermarkDisplaySequencer.cpp jsbindings/PersistentWatermark/PersistentWatermarkEventHandler.cpp jsbindings/PersistentWatermark/PersistentWatermarkPluginAccess.cpp jsbindings/PersistentWatermark/PersistentWatermarkStorage.cpp) |
| 28 | +@@ -686,7 +687,8 @@ if(CMAKE_AUXILIARY_AUDIO_ENABLED) |
| 29 | + endif() |
| 30 | + |
| 31 | + message("LIB_AAMP_DEPENDS is ${LIBAAMP_DEPENDS}") |
| 32 | +-target_link_libraries(aamp ${LIBAAMP_DEPENDS} ${LIBAAMP_MOCK_DEPENDS}) |
| 33 | ++#target_link_libraries(aamp ${LIBAAMP_DEPENDS} ${LIBAAMP_MOCK_DEPENDS}) |
| 34 | ++target_link_libraries(aamp -L$ENV{EXT_INSTALL_PATH}/lib ${LIBAAMP_DEPENDS} ${LIBAAMP_MOCK_DEPENDS}) |
| 35 | + |
| 36 | + if (CMAKE_WPEFRAMEWORK_REQUIRED) |
| 37 | + set(LIBAAMP_DEFINES "${LIBAAMP_DEFINES} -DUSE_CPP_THUNDER_PLUGIN_ACCESS") |
| 38 | +@@ -728,7 +730,9 @@ set(GSTTESTHARNESS_SOURCES test/gstTestHarness/gst-port.cpp |
| 39 | + test/gstTestHarness/string_utils.cpp) |
| 40 | + |
| 41 | + add_executable(gstTestHarness ${GSTTESTHARNESS_HEADERS} ${GSTTESTHARNESS_SOURCES}) |
| 42 | +-target_link_libraries(gstTestHarness ${GSTTESTHARNESS_DEPENDS} "-lreadline") |
| 43 | ++#target_link_libraries(gstTestHarness ${GSTTESTHARNESS_DEPENDS} "-lreadline") |
| 44 | ++target_link_libraries(gstTestHarness ${GSTTESTHARNESS_DEPENDS} "-L$ENV{EXT_INSTALL_PATH}/lib -lreadline") |
| 45 | ++ |
| 46 | + # XCode schema target |
| 47 | + xcode_define_schema(gstTestHarness) |
| 48 | + |
| 49 | +@@ -777,9 +781,9 @@ if (UTEST_ENABLED) |
| 50 | + add_subdirectory(test/utests EXCLUDE_FROM_ALL) |
| 51 | + endif() |
| 52 | + |
| 53 | +-if (CMAKE_PLATFORM_UBUNTU OR CMAKE_SYSTEM_NAME STREQUAL Darwin ) |
| 54 | +- install(FILES build/aampcli-run-subtec.sh DESTINATION bin) |
| 55 | +-endif() |
| 56 | ++#if (CMAKE_PLATFORM_UBUNTU OR CMAKE_SYSTEM_NAME STREQUAL Darwin ) |
| 57 | ++# install(FILES build/aampcli-run-subtec.sh DESTINATION bin) |
| 58 | ++#endif() |
| 59 | + |
| 60 | + message("LIBAAMP_DEFINES is ${LIBAAMP_DEFINES}") |
| 61 | + message("LIBAAMP_SOURCES is ${LIBAAMP_SOURCES}") |
0 commit comments