QuasarApp/openssl-cmake
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl-cmake.git synced 2025-05-06 22:49:38 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: QuasarApp:master
Branches Tags
QuasarApp:master
QuasarApp:1.0.2
QuasarApp:1.1.1e-20200319
QuasarApp:1.1.1d-20200319
QuasarApp:1.0.2p-20191208
QuasarApp:1.1.1d-20191209
QuasarApp:1.1.1d-20191204
QuasarApp:1.1.1d-20191203
..
compare: QuasarApp:1.1.1e-20200319
Branches Tags
QuasarApp:master
QuasarApp:1.0.2
QuasarApp:1.1.1e-20200319
QuasarApp:1.1.1d-20200319
QuasarApp:1.0.2p-20191208
QuasarApp:1.1.1d-20191209
QuasarApp:1.1.1d-20191204
QuasarApp:1.1.1d-20191203

No commits in common. "master" and "1.1.1e-20200319" have entirely different histories.
master ... 1.1.1e-202

3 changed files with 14 additions and 22 deletions
Show Stats Expand all files Collapse all files

32
CMakeLists.txt
View File

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

2
crypto/CMakeLists.txt
View File

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

2
ssl/CMakeLists.txt
View File

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