khronos: not to build and install common EGL and GLES 55/219455/1 accepted/tizen/unified/20191211.121117 submit/tizen/20191210.071113
authorSeung-Woo Kim <sw0312.kim@samsung.com>
Thu, 5 Dec 2019 04:50:01 +0000 (13:50 +0900)
committerSeung-Woo Kim <sw0312.kim@samsung.com>
Thu, 5 Dec 2019 04:51:53 +0000 (13:51 +0900)
There is conflict for EGL and GLES with mesa. So remove common
EGL and GLES from brcm userland.
There are still same libraries with brcm naming.

Change-Id: Ie9271f5de4f4e761174321a39d555408a143a8d4
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
interface/khronos/CMakeLists.txt

index 9ad615b..4de44d1 100755 (executable)
@@ -55,10 +55,12 @@ set(CLIENT_SOURCE
    common/khrn_int_hash_asm.s
    common/khrn_client_cache.c)
 
+if(USE_BRCM_GL)
 add_library(EGL ${SHARED} ${EGL_SOURCE})
 add_library(GLESv2 ${SHARED} ${GLES_SOURCE})
 add_library(OpenVG ${SHARED} ${VG_SOURCE})
 add_library(WFC ${SHARED} ${WFC_SOURCE})
+endif()
 add_library(khrn_client ${CLIENT_SOURCE})
 
 # TODO do we need EGL_static and GLESv2_static now that khrn_static exists?
@@ -73,12 +75,14 @@ set(VCSM_LIBS vcsm)
 add_definitions(-DKHRONOS_HAVE_VCSM)
 endif()
 
+if(USE_BRCM_GL)
 target_link_libraries(EGL khrn_client vchiq_arm vcos bcm_host ${VCSM_LIBS} -lm)
 target_link_libraries(GLESv2 EGL khrn_client vcos)
 target_link_libraries(WFC EGL)
 target_link_libraries(OpenVG EGL)
 
-install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION lib)
+install(TARGETS EGL GLESv2 OpenVG WFC DESTINATION lib)
+endif()
 install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION lib)
 
 # recommended names to use to avoid conflicts with mesa libs
@@ -92,4 +96,4 @@ target_link_libraries(brcmGLESv2 brcmEGL khrn_client vcos)
 target_link_libraries(brcmWFC brcmEGL)
 target_link_libraries(brcmOpenVG brcmEGL)
 
-install(TARGETS brcmEGL brcmGLESv2 brcmOpenVG brcmWFC DESTINATION lib)
+install(TARGETS brcmEGL brcmGLESv2 brcmOpenVG brcmWFC khrn_client DESTINATION lib)