CMakeLists.txt

@@ -25,7 +25,7 @@
 # SOFTWARE.
 
 set( CMAKE_LEGACY_CYGWIN_WIN32 0 )
-project( openssl LANGUAGES C)
+project( openssl )
 cmake_minimum_required( VERSION 3.1.0 )
 
 set( CMAKE_DISABLE_SOURCE_CHANGES ON )
@@ -140,25 +140,17 @@ if( MINGW )
   set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--export-all" )
 endif()
 
-#include( CheckTypeSize )
-
-#check_type_size( "long" LONG_INT )
-#check_type_size( "long long" LONG_LONG_INT )
-#check_type_size( "int" INT )
-#if( HAVE_LONG_INT AND (${LONG_INT} EQUAL 8) )
-#  set( SIXTY_FOUR_BIT_LONG ON )
-#elseif( HAVE_LONG_LONG_INT AND (${LONG_LONG_INT} EQUAL 8) )
-#  set( SIXTY_FOUR_BIT ON )
-#else()
-#  set( THIRTY_TWO_BIT ON )
-#endif()
-
-IF(ANDROID)
-    set( THIRTY_TWO_BIT ON )
-ELSE()
-    set( SIXTY_FOUR_BIT ON )
-ENDIF()
-
+include( CheckTypeSize )
+check_type_size( "long" LONG_INT )
+check_type_size( "long long" LONG_LONG_INT )
+check_type_size( "int" INT )
+if( HAVE_LONG_INT AND (${LONG_INT} EQUAL 8) )
+  set( SIXTY_FOUR_BIT_LONG ON )
+elseif( HAVE_LONG_LONG_INT AND (${LONG_LONG_INT} EQUAL 8) )
+  set( SIXTY_FOUR_BIT ON )
+else()
+  set( THIRTY_TWO_BIT ON )
+endif()
 
 if( MSVC OR ( WIN32 AND MINGW AND NOT CYGWIN ) )
   set( OPENSSL_EXPORT_VAR_AS_FUNCTION 1 )

crypto/CMakeLists.txt

@@ -278,7 +278,7 @@ else()
   add_submodule ( . threads_pthread.c )
 endif()
 
-add_library( crypto SHARED ${LIBSRC} ${OBJECTS_SRC} )
+add_library( crypto ${LIBSRC} ${OBJECTS_SRC} )
 
 target_include_directories( crypto PUBLIC ${PROJECT_BINARY_DIR}/include )
 

ssl/CMakeLists.txt

@@ -43,7 +43,7 @@ include_directories( BEFORE SYSTEM
   ${PROJECT_SOURCE_DIR}/ # e_os.h
 )
 
-add_library( ssl SHARED ${LIBSRC} )
+add_library( ssl ${LIBSRC} )
 
 target_include_directories( ssl PUBLIC ${PROJECT_BINARY_DIR}/include )