jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #221 from berolinux/static-helper-libs

Browse source 
Make sure helper libraries get built as static libs
This commit is contained in:
Simon Fels 2017-05-04 18:38:48 +02:00 • committed by GitHub
commit 3c70c4a80d
10 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
external/android-emugl/host/libs/GLESv1_dec/CMakeLists.txt vendored
View file

@ -20,5 +20,5 @@ if ("${cmake_build_type_lower}" STREQUAL "trace")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENGL_DEBUG}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENGL_DEBUG}")
endif() endif()
add_library(GLESv1_dec ${SOURCES} ${GENERATED_SOURCES}) add_library(GLESv1_dec STATIC ${SOURCES} ${GENERATED_SOURCES})
target_link_libraries(GLESv1_dec OpenglCodecCommon) target_link_libraries(GLESv1_dec OpenglCodecCommon)

2
external/android-emugl/host/libs/GLESv2_dec/CMakeLists.txt vendored
View file

@ -20,5 +20,5 @@ if ("${cmake_build_type_lower}" STREQUAL "trace")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENGL_DEBUG}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENGL_DEBUG}")
endif() endif()
add_library(GLESv2_dec ${SOURCES} ${GENERATED_SOURCES}) add_library(GLESv2_dec STATIC ${SOURCES} ${GENERATED_SOURCES})
target_link_libraries(GLESv2_dec OpenglCodecCommon) target_link_libraries(GLESv2_dec OpenglCodecCommon)

2
external/android-emugl/host/libs/Translator/GLcommon/CMakeLists.txt vendored
View file

@ -12,6 +12,6 @@ set(SOURCES
objectNameManager.cpp objectNameManager.cpp
FramebufferData.cpp) FramebufferData.cpp)
add_library(GLcommon ${SOURCES}) add_library(GLcommon STATIC ${SOURCES})
target_link_libraries(GLcommon target_link_libraries(GLcommon
emugl_common) emugl_common)

2
external/android-emugl/host/libs/libOpenGLESDispatch/CMakeLists.txt vendored
View file

@ -3,7 +3,7 @@ set(SOURCES
GLESv2Dispatch.cpp GLESv2Dispatch.cpp
GLESv1Dispatch.cpp) GLESv1Dispatch.cpp)
add_library(OpenGLESDispatch ${SOURCES} ${GENERATED_SOURCES}) add_library(OpenGLESDispatch STATIC ${SOURCES} ${GENERATED_SOURCES})
target_link_libraries(OpenGLESDispatch target_link_libraries(OpenGLESDispatch
emugl_common emugl_common
GLESv2_dec GLESv2_dec

2
external/android-emugl/host/libs/renderControl_dec/CMakeLists.txt vendored
View file

@ -16,5 +16,5 @@ if ("${cmake_build_type_lower}" STREQUAL "trace")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENGL_DEBUG}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENGL_DEBUG}")
endif() endif()
add_library(renderControl_dec ${GENERATED_SOURCES}) add_library(renderControl_dec STATIC ${GENERATED_SOURCES})
target_link_libraries(renderControl_dec OpenglCodecCommon) target_link_libraries(renderControl_dec OpenglCodecCommon)

2
external/android-emugl/shared/OpenglCodecCommon/CMakeLists.txt vendored
View file

@ -12,4 +12,4 @@ set(SOURCES
Makefile Makefile
ProtocolUtils.h) ProtocolUtils.h)
add_library(OpenglCodecCommon ${SOURCES}) add_library(OpenglCodecCommon STATIC ${SOURCES})

2
external/android-emugl/shared/emugl/common/CMakeLists.txt vendored
View file

@ -28,6 +28,6 @@ set(COMMON_SOURCES
thread_unittest.cpp thread_unittest.cpp
unique_integer_map.h) unique_integer_map.h)
add_library(emugl_common ${COMMON_SOURCES}) add_library(emugl_common STATIC ${COMMON_SOURCES})
target_link_libraries(emugl_common target_link_libraries(emugl_common
dl pthread) dl pthread)

2
external/process-cpp-minimal/src/CMakeLists.txt vendored
View file

@ -15,6 +15,8 @@
# Authored by: Thomas Voss <thomas.voss@canonical.com> # Authored by: Thomas Voss <thomas.voss@canonical.com>
add_library( add_library(
process-cpp process-cpp
STATIC
core/posix/backtrace.h core/posix/backtrace.h
core/posix/backtrace.cpp core/posix/backtrace.cpp

2
external/xdg/CMakeLists.txt vendored
View file

@ -11,7 +11,7 @@ include_directories(
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
) )
add_library(xdg xdg.cpp) add_library(xdg STATIC xdg.cpp)
set_property(TARGET xdg PROPERTY CXX_STANDARD 11) set_property(TARGET xdg PROPERTY CXX_STANDARD 11)
target_link_libraries(xdg ${Boost_LIBRARIES}) target_link_libraries(xdg ${Boost_LIBRARIES})

3
src/CMakeLists.txt
View file

@ -41,6 +41,7 @@ protobuf_generate_cpp(
add_library(anbox-protobuf add_library(anbox-protobuf
STATIC
${GENERATED_PROTOBUF_BRIDGE_SRCS} ${GENERATED_PROTOBUF_BRIDGE_SRCS}
${GENERATED_PROTOBUF_BRIDGE_HDRS} ${GENERATED_PROTOBUF_BRIDGE_HDRS}
${GENERATED_PROTOBUF_RPC_SRCS} ${GENERATED_PROTOBUF_RPC_SRCS}
@ -207,7 +208,7 @@ set(SOURCES
anbox/optional.h anbox/optional.h
anbox/defer_action.h) anbox/defer_action.h)
add_library(anbox-core ${SOURCES}) add_library(anbox-core STATIC ${SOURCES})
target_link_libraries(anbox-core target_link_libraries(anbox-core
${Boost_LDFLAGS} ${Boost_LDFLAGS}
${Boost_LIBRARIES} ${Boost_LIBRARIES}