Merge pull request #4202 from marek-safar/compression

[mono.git] / mono / btls / CMakeLists.txt

diff --git a/mono/btls/CMakeLists.txt b/mono/btls/CMakeLists.txt
index 0e01496e9fa75e6b56c8e01140b564279673b79b..41ad49155e0d8442d2ca07c152436841d9d03e77 100644 (file)
--- a/mono/btls/CMakeLists.txt
+++ b/mono/btls/CMakeLists.txt
@@ -22,7 +22,13 @@ if (NOT "${BTLS_ARCH}" STREQUAL "")
        message (WARNING "SET ARCH: ${BTLS_ARCH}")
        set (CMAKE_SYSTEM_PROCESSOR "${BTLS_ARCH}")
 endif ()
+if (BUILD_DYNAMIC_BTLS)
+set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -fPIC -ggdb -fvisibility=hidden")
+elseif (BUILD_SHARED_LIBS)
+set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -fPIC -ggdb -fvisibility=hidden")
+else ()
 set (C_CXX_FLAGS "-Wall -Wsign-compare -Wmissing-field-initializers -ggdb -fvisibility=hidden")
+endif()
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_CXX_FLAGS} ${BTLS_CFLAGS}")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${C_CXX_FLAGS} ${BTLS_CFLAGS}")
 set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} ${BTLS_CFLAGS}")
@@ -51,6 +57,7 @@ set (
        btls-ssl-ctx.h
        btls-ssl.c
        btls-ssl.h
+       btls-time64.c
        btls-util.c
        btls-util.h
        btls-x509-chain.c
@@ -74,22 +81,11 @@ set (
        btls-x509.c
        btls-x509.h
 
-       btls-android-utils.c
-
        ${BORINGSSL_OBJECTS}
 )
 
-if (BUILD_DYNAMIC_BTLS)
-       add_library (mono-btls-shared SHARED ${MONO_BTLS_SOURCES})
-elseif (BUILD_SHARED_LIBS)
+if (BUILD_SHARED_LIBS)
        add_library (mono-btls-shared SHARED ${MONO_BTLS_SOURCES})
-       set_target_properties (mono-btls-shared PROPERTIES RULE_LAUNCH_LINK
-               "${PROJECT_SOURCE_DIR}/create-object-library.sh ${CMAKE_BINARY_DIR} mono-btls-shared.txt mono-btls-shared-lo.txt libmono-btls-shared.a shared ${CMAKE_AR} ${CMAKE_RANLIB} <OBJECTS> --"
-       )
 else ()
        add_library (mono-btls-static STATIC ${MONO_BTLS_SOURCES})
-       set_target_properties (mono-btls-static PROPERTIES RULE_LAUNCH_LINK
-               "${PROJECT_SOURCE_DIR}/create-object-library.sh ${CMAKE_BINARY_DIR} mono-btls-static.txt mono-btls-static-lo.txt libmono-btls-static.a static ${CMAKE_AR} ${CMAKE_RANLIB} <OBJECTS> --"
-       )
 endif ()
-