Skip to content

Commit

Permalink
fix import of the project
Browse files Browse the repository at this point in the history
  • Loading branch information
janbar committed May 9, 2019
1 parent 6f5bfe4 commit d9afd24
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
12 changes: 9 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ cmake_minimum_required( VERSION 3.1.0 )
set(CMAKE_DISABLE_SOURCE_CHANGES ON)
set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)

set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")

option(WITH_APPS "Build applications" ON)

# OpenSSL version detection imported from FindOpenSSL.cmake

file(STRINGS "${CMAKE_SOURCE_DIR}/include/openssl/opensslv.h" openssl_version_str
file(STRINGS "${PROJECT_SOURCE_DIR}/include/openssl/opensslv.h" openssl_version_str
REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")

function(from_hex HEX DEC)
Expand Down Expand Up @@ -156,10 +156,16 @@ if ( WIN32 AND MINGW AND NOT CYGWIN )
set( OPENSSL_EXPORT_VAR_AS_FUNCTION true )
endif()

if ( ANDROID )
set ( BUILD_SHARED_LIBS ON )
elseif ( IOS )
set ( BUILD_SHARED_LIBS OFF )
endif()

add_subdirectory(crypto)
add_subdirectory(ssl)

if(WITH_APPS)
if(WITH_APPS AND NOT ANDROID AND NOT IOS)
add_subdirectory(apps)
endif()

Expand Down
4 changes: 0 additions & 4 deletions crypto/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,6 @@ set( LIBSRC
cpt_err.c cryptlib.c ctype.c cversion.c ebcdic.c ex_data.c init.c mem.c mem_clr.c mem_dbg.c mem_sec.c o_dir.c o_fips.c
o_fopen.c o_init.c o_str.c o_time.c uid.c )

if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/getenv.c")
list(APPEND LIBSRC getenv.c)
endif()

include_directories( BEFORE SYSTEM include modes ec/curve448 ec/curve448/arch_32 )

if( BUILD_SHARED_LIBS )
Expand Down

0 comments on commit d9afd24

Please sign in to comment.