diff --git a/CMakeLists.txt b/CMakeLists.txt
index 549849f..2060263 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8.8)
+cmake_minimum_required (VERSION 3.1)
 include(CheckFunctionExists)
 include(CheckLibraryExists)
 include(CheckIncludeFiles)
diff --git a/apps/nc/CMakeLists.txt b/apps/nc/CMakeLists.txt
index 5b18c88..59e08b4 100644
--- a/apps/nc/CMakeLists.txt
+++ b/apps/nc/CMakeLists.txt
@@ -1,7 +1,6 @@
 if(BUILD_NC)
 
-set(
-	NC_SRC
+add_executable(nc
 	atomicio.c
 	netcat.c
 	socks.c
@@ -10,39 +9,38 @@ set(
 
 check_function_exists(b64_ntop HAVE_B64_NTOP)
 if(HAVE_B64_NTOP)
-	add_definitions(-DHAVE_B64_NTOP)
+	target_compile_definitions(nc PRIVATE HAVE_B64_NTOP)
 else()
-	set(NC_SRC ${NC_SRC} compat/base64.c)
+	target_sources(nc PRIVATE compat/base64.c)
 endif()
 
 check_function_exists(accept4 HAVE_ACCEPT4)
 if(HAVE_ACCEPT4)
-	add_definitions(-DHAVE_ACCEPT4)
+	target_compile_definitions(nc PRIVATE HAVE_ACCEPT4)
 else()
-	set(NC_SRC ${NC_SRC} compat/accept4.c)
+	target_sources(nc PRIVATE compat/accept4.c)
 endif()
 
 check_function_exists(readpassphrase HAVE_READPASSPHRASE)
 if(HAVE_READPASSPHRASE)
-	add_definitions(-DHAVE_READPASSPHRASE)
+	target_compile_definitions(nc PRIVATE HAVE_READPASSPHRASE)
 else()
-	set(NC_SRC ${NC_SRC} compat/readpassphrase.c)
+	target_sources(nc PRIVATE compat/readpassphrase.c)
 endif()
 
 check_function_exists(strtonum HAVE_STRTONUM)
 if(HAVE_STRTONUM)
-	add_definitions(-DHAVE_STRTONUM)
+	target_compile_definitions(nc PRIVATE HAVE_STRTONUM)
 else()
-	set(NC_SRC ${NC_SRC} compat/strtonum.c)
+	target_sources(nc PRIVATE compat/strtonum.c)
 endif()
 
 if(NOT "${OPENSSLDIR}" STREQUAL "")
-	add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
+	target_compile_definitions(nc PRIVATE DEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
 else()
-	add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\")
+	target_compile_definitions(nc PRIVATE DEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\")
 endif()
 
-add_executable(nc ${NC_SRC})
 target_include_directories(nc
 		PRIVATE
 			.
diff --git a/apps/ocspcheck/CMakeLists.txt b/apps/ocspcheck/CMakeLists.txt
index 2b659bc..0cd6193 100644
--- a/apps/ocspcheck/CMakeLists.txt
+++ b/apps/ocspcheck/CMakeLists.txt
@@ -1,25 +1,23 @@
 if(NOT MSVC)
 
-set(
-	OCSPCHECK_SRC
+add_executable(ocspcheck
 	http.c
 	ocspcheck.c
 )
 
 check_function_exists(memmem HAVE_MEMMEM)
 if(HAVE_MEMMEM)
-        add_definitions(-DHAVE_MEMMEM)
+        target_compile_definitions(ocspcheck PRIVATE HAVE_MEMMEM)
 else()
-        set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c)
+        target_sources(ocspcheck PRIVATE compat/memmem.c)
 endif()
 
 if(NOT "${OPENSSLDIR}" STREQUAL "")
-	add_definitions(-DDEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
+	target_compile_definitions(ocspcheck PRIVATE DEFAULT_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
 else()
-	add_definitions(-DDEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\")
+	target_compile_definitions(ocspcheck PRIVATE DEFAULT_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\")
 endif()
 
-add_executable(ocspcheck ${OCSPCHECK_SRC})
 target_include_directories(ocspcheck
 		PRIVATE
 		.
diff --git a/apps/openssl/CMakeLists.txt b/apps/openssl/CMakeLists.txt
index 77935c4..5586c38 100644
--- a/apps/openssl/CMakeLists.txt
+++ b/apps/openssl/CMakeLists.txt
@@ -1,5 +1,4 @@
-set(
-	OPENSSL_SRC
+add_executable(openssl
 	apps.c
 	asn1pars.c
 	ca.c
@@ -50,24 +49,25 @@ set(
 )
 
 if(UNIX)
-	set(OPENSSL_SRC ${OPENSSL_SRC} apps_posix.c)
-	set(OPENSSL_SRC ${OPENSSL_SRC} certhash.c)
+	target_sources(openssl PRIVATE
+		apps_posix.c
+		certhash.c)
 endif()
 
 if(WIN32)
-	set(OPENSSL_SRC ${OPENSSL_SRC} apps_win.c)
-	set(OPENSSL_SRC ${OPENSSL_SRC} certhash_win.c)
-	set(OPENSSL_SRC ${OPENSSL_SRC} compat/poll_win.c)
+	target_sources(openssl PRIVATE
+		apps_win.c
+	    certhash_win.c
+		compat/poll_win.c)
 endif()
 
 check_function_exists(strtonum HAVE_STRTONUM)
 if(HAVE_STRTONUM)
-	add_definitions(-DHAVE_STRTONUM)
+	target_compile_definitions(openssl PRIVATE HAVE_STRTONUM)
 else()
-	set(OPENSSL_SRC ${OPENSSL_SRC} compat/strtonum.c)
+	target_sources(openssl PRIVATE compat/strtonum.c)
 endif()
 
-add_executable(openssl ${OPENSSL_SRC})
 target_include_directories(openssl
 		PRIVATE
 			.)
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index ef6276a..4c390f4 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -1,6 +1,541 @@
+add_library(crypto
+		cpt_err.c
+		cryptlib.c
+		crypto_init.c
+		cversion.c
+		ex_data.c
+		malloc-wrapper.c
+		mem_clr.c
+		mem_dbg.c
+		o_init.c
+		o_str.c
+		o_time.c
+		aes/aes_cfb.c
+		aes/aes_ctr.c
+		aes/aes_ecb.c
+		aes/aes_ige.c
+		aes/aes_misc.c
+		aes/aes_ofb.c
+		aes/aes_wrap.c
+		asn1/a_bitstr.c
+		asn1/a_bool.c
+		asn1/a_bytes.c
+		asn1/a_d2i_fp.c
+		asn1/a_digest.c
+		asn1/a_dup.c
+		asn1/a_enum.c
+		asn1/a_i2d_fp.c
+		asn1/a_int.c
+		asn1/a_mbstr.c
+		asn1/a_object.c
+		asn1/a_octet.c
+		asn1/a_print.c
+		asn1/a_set.c
+		asn1/a_sign.c
+		asn1/a_strex.c
+		asn1/a_strnid.c
+		asn1/a_time.c
+		asn1/a_time_tm.c
+		asn1/a_type.c
+		asn1/a_utf8.c
+		asn1/a_verify.c
+		asn1/ameth_lib.c
+		asn1/asn1_err.c
+		asn1/asn1_gen.c
+		asn1/asn1_lib.c
+		asn1/asn1_par.c
+		asn1/asn_mime.c
+		asn1/asn_moid.c
+		asn1/asn_pack.c
+		asn1/bio_asn1.c
+		asn1/bio_ndef.c
+		asn1/d2i_pr.c
+		asn1/d2i_pu.c
+		asn1/evp_asn1.c
+		asn1/f_enum.c
+		asn1/f_int.c
+		asn1/f_string.c
+		asn1/i2d_pr.c
+		asn1/i2d_pu.c
+		asn1/n_pkey.c
+		asn1/nsseq.c
+		asn1/p5_pbe.c
+		asn1/p5_pbev2.c
+		asn1/p8_pkey.c
+		asn1/t_bitst.c
+		asn1/t_crl.c
+		asn1/t_pkey.c
+		asn1/t_req.c
+		asn1/t_spki.c
+		asn1/t_x509.c
+		asn1/t_x509a.c
+		asn1/tasn_dec.c
+		asn1/tasn_enc.c
+		asn1/tasn_fre.c
+		asn1/tasn_new.c
+		asn1/tasn_prn.c
+		asn1/tasn_typ.c
+		asn1/tasn_utl.c
+		asn1/x_algor.c
+		asn1/x_attrib.c
+		asn1/x_bignum.c
+		asn1/x_crl.c
+		asn1/x_exten.c
+		asn1/x_info.c
+		asn1/x_long.c
+		asn1/x_name.c
+		asn1/x_nx509.c
+		asn1/x_pkey.c
+		asn1/x_pubkey.c
+		asn1/x_req.c
+		asn1/x_sig.c
+		asn1/x_spki.c
+		asn1/x_val.c
+		asn1/x_x509.c
+		asn1/x_x509a.c
+		bf/bf_cfb64.c
+		bf/bf_ecb.c
+		bf/bf_enc.c
+		bf/bf_ofb64.c
+		bf/bf_skey.c
+		bio/b_dump.c
+		bio/b_print.c
+		bio/b_sock.c
+		bio/bf_buff.c
+		bio/bf_nbio.c
+		bio/bf_null.c
+		bio/bio_cb.c
+		bio/bio_err.c
+		bio/bio_lib.c
+		bio/bio_meth.c
+		bio/bss_acpt.c
+		bio/bss_bio.c
+		bio/bss_conn.c
+		bio/bss_dgram.c
+		bio/bss_fd.c
+		bio/bss_file.c
+		bio/bss_mem.c
+		bio/bss_null.c
+		bio/bss_sock.c
+		bn/bn_add.c
+		bn/bn_asm.c
+		bn/bn_blind.c
+		bn/bn_const.c
+		bn/bn_ctx.c
+		bn/bn_depr.c
+		bn/bn_div.c
+		bn/bn_err.c
+		bn/bn_exp.c
+		bn/bn_exp2.c
+		bn/bn_gcd.c
+		bn/bn_gf2m.c
+		bn/bn_kron.c
+		bn/bn_lib.c
+		bn/bn_mod.c
+		bn/bn_mont.c
+		bn/bn_mpi.c
+		bn/bn_mul.c
+		bn/bn_nist.c
+		bn/bn_prime.c
+		bn/bn_print.c
+		bn/bn_rand.c
+		bn/bn_recp.c
+		bn/bn_shift.c
+		bn/bn_sqr.c
+		bn/bn_sqrt.c
+		bn/bn_word.c
+		bn/bn_x931p.c
+		buffer/buf_err.c
+		buffer/buf_str.c
+		buffer/buffer.c
+		camellia/cmll_cfb.c
+		camellia/cmll_ctr.c
+		camellia/cmll_ecb.c
+		camellia/cmll_misc.c
+		camellia/cmll_ofb.c
+		cast/c_cfb64.c
+		cast/c_ecb.c
+		cast/c_enc.c
+		cast/c_ofb64.c
+		cast/c_skey.c
+		chacha/chacha.c
+		cmac/cm_ameth.c
+		cmac/cm_pmeth.c
+		cmac/cmac.c
+		comp/c_rle.c
+		comp/c_zlib.c
+		comp/comp_err.c
+		comp/comp_lib.c
+		conf/conf_api.c
+		conf/conf_def.c
+		conf/conf_err.c
+		conf/conf_lib.c
+		conf/conf_mall.c
+		conf/conf_mod.c
+		conf/conf_sap.c
+		curve25519/curve25519-generic.c
+		curve25519/curve25519.c
+		des/cbc_cksm.c
+		des/cbc_enc.c
+		des/cfb64ede.c
+		des/cfb64enc.c
+		des/cfb_enc.c
+		des/des_enc.c
+		des/ecb3_enc.c
+		des/ecb_enc.c
+		des/ede_cbcm_enc.c
+		des/enc_read.c
+		des/enc_writ.c
+		des/fcrypt.c
+		des/fcrypt_b.c
+		des/ofb64ede.c
+		des/ofb64enc.c
+		des/ofb_enc.c
+		des/pcbc_enc.c
+		des/qud_cksm.c
+		des/rand_key.c
+		des/set_key.c
+		des/str2key.c
+		des/xcbc_enc.c
+		dh/dh_ameth.c
+		dh/dh_asn1.c
+		dh/dh_check.c
+		dh/dh_depr.c
+		dh/dh_err.c
+		dh/dh_gen.c
+		dh/dh_key.c
+		dh/dh_lib.c
+		dh/dh_pmeth.c
+		dh/dh_prn.c
+		dsa/dsa_ameth.c
+		dsa/dsa_asn1.c
+		dsa/dsa_depr.c
+		dsa/dsa_err.c
+		dsa/dsa_gen.c
+		dsa/dsa_key.c
+		dsa/dsa_lib.c
+		dsa/dsa_meth.c
+		dsa/dsa_ossl.c
+		dsa/dsa_pmeth.c
+		dsa/dsa_prn.c
+		dsa/dsa_sign.c
+		dsa/dsa_vrf.c
+		dso/dso_dlfcn.c
+		dso/dso_err.c
+		dso/dso_lib.c
+		dso/dso_null.c
+		dso/dso_openssl.c
+		ec/ec2_mult.c
+		ec/ec2_oct.c
+		ec/ec2_smpl.c
+		ec/ec_ameth.c
+		ec/ec_asn1.c
+		ec/ec_check.c
+		ec/ec_curve.c
+		ec/ec_cvt.c
+		ec/ec_err.c
+		ec/ec_key.c
+		ec/ec_lib.c
+		ec/ec_mult.c
+		ec/ec_oct.c
+		ec/ec_pmeth.c
+		ec/ec_print.c
+		ec/eck_prn.c
+		ec/ecp_mont.c
+		ec/ecp_nist.c
+		ec/ecp_oct.c
+		ec/ecp_smpl.c
+		ecdh/ech_err.c
+		ecdh/ech_key.c
+		ecdh/ech_lib.c
+		ecdsa/ecs_asn1.c
+		ecdsa/ecs_err.c
+		ecdsa/ecs_lib.c
+		ecdsa/ecs_ossl.c
+		ecdsa/ecs_sign.c
+		ecdsa/ecs_vrf.c
+		engine/eng_all.c
+		engine/eng_cnf.c
+		engine/eng_ctrl.c
+		engine/eng_dyn.c
+		engine/eng_err.c
+		engine/eng_fat.c
+		engine/eng_init.c
+		engine/eng_lib.c
+		engine/eng_list.c
+		engine/eng_openssl.c
+		engine/eng_pkey.c
+		engine/eng_table.c
+		engine/tb_asnmth.c
+		engine/tb_cipher.c
+		engine/tb_dh.c
+		engine/tb_digest.c
+		engine/tb_dsa.c
+		engine/tb_ecdh.c
+		engine/tb_ecdsa.c
+		engine/tb_pkmeth.c
+		engine/tb_rand.c
+		engine/tb_rsa.c
+		engine/tb_store.c
+		err/err.c
+		err/err_all.c
+		err/err_prn.c
+		evp/bio_b64.c
+		evp/bio_enc.c
+		evp/bio_md.c
+		evp/c_all.c
+		evp/digest.c
+		evp/e_aes.c
+		evp/e_aes_cbc_hmac_sha1.c
+		evp/e_bf.c
+		evp/e_camellia.c
+		evp/e_cast.c
+		evp/e_chacha.c
+		evp/e_chacha20poly1305.c
+		evp/e_des.c
+		evp/e_des3.c
+		evp/e_gost2814789.c
+		evp/e_idea.c
+		evp/e_null.c
+		evp/e_old.c
+		evp/e_rc2.c
+		evp/e_rc4.c
+		evp/e_rc4_hmac_md5.c
+		evp/e_xcbc_d.c
+		evp/encode.c
+		evp/evp_aead.c
+		evp/evp_enc.c
+		evp/evp_err.c
+		evp/evp_key.c
+		evp/evp_lib.c
+		evp/evp_pbe.c
+		evp/evp_pkey.c
+		evp/m_dss.c
+		evp/m_dss1.c
+		evp/m_ecdsa.c
+		evp/m_gost2814789.c
+		evp/m_gostr341194.c
+		evp/m_md4.c
+		evp/m_md5.c
+		evp/m_md5_sha1.c
+		evp/m_null.c
+		evp/m_ripemd.c
+		evp/m_sha1.c
+		evp/m_sigver.c
+		evp/m_streebog.c
+		evp/m_wp.c
+		evp/names.c
+		evp/p5_crpt.c
+		evp/p5_crpt2.c
+		evp/p_dec.c
+		evp/p_enc.c
+		evp/p_lib.c
+		evp/p_open.c
+		evp/p_seal.c
+		evp/p_sign.c
+		evp/p_verify.c
+		evp/pmeth_fn.c
+		evp/pmeth_gn.c
+		evp/pmeth_lib.c
+		gost/gost2814789.c
+		gost/gost89_keywrap.c
+		gost/gost89_params.c
+		gost/gost89imit_ameth.c
+		gost/gost89imit_pmeth.c
+		gost/gost_asn1.c
+		gost/gost_err.c
+		gost/gostr341001.c
+		gost/gostr341001_ameth.c
+		gost/gostr341001_key.c
+		gost/gostr341001_params.c
+		gost/gostr341001_pmeth.c
+		gost/gostr341194.c
+		gost/streebog.c
+		hkdf/hkdf.c
+		hmac/hm_ameth.c
+		hmac/hm_pmeth.c
+		hmac/hmac.c
+		idea/i_cbc.c
+		idea/i_cfb64.c
+		idea/i_ecb.c
+		idea/i_ofb64.c
+		idea/i_skey.c
+		lhash/lh_stats.c
+		lhash/lhash.c
+		md4/md4_dgst.c
+		md4/md4_one.c
+		md5/md5_dgst.c
+		md5/md5_one.c
+		modes/cbc128.c
+		modes/ccm128.c
+		modes/cfb128.c
+		modes/ctr128.c
+		modes/cts128.c
+		modes/gcm128.c
+		modes/ofb128.c
+		modes/xts128.c
+		objects/o_names.c
+		objects/obj_dat.c
+		objects/obj_err.c
+		objects/obj_lib.c
+		objects/obj_xref.c
+		ocsp/ocsp_asn.c
+		ocsp/ocsp_cl.c
+		ocsp/ocsp_err.c
+		ocsp/ocsp_ext.c
+		ocsp/ocsp_ht.c
+		ocsp/ocsp_lib.c
+		ocsp/ocsp_prn.c
+		ocsp/ocsp_srv.c
+		ocsp/ocsp_vfy.c
+		pem/pem_all.c
+		pem/pem_err.c
+		pem/pem_info.c
+		pem/pem_lib.c
+		pem/pem_oth.c
+		pem/pem_pk8.c
+		pem/pem_pkey.c
+		pem/pem_seal.c
+		pem/pem_sign.c
+		pem/pem_x509.c
+		pem/pem_xaux.c
+		pem/pvkfmt.c
+		pkcs12/p12_add.c
+		pkcs12/p12_asn.c
+		pkcs12/p12_attr.c
+		pkcs12/p12_crpt.c
+		pkcs12/p12_crt.c
+		pkcs12/p12_decr.c
+		pkcs12/p12_init.c
+		pkcs12/p12_key.c
+		pkcs12/p12_kiss.c
+		pkcs12/p12_mutl.c
+		pkcs12/p12_npas.c
+		pkcs12/p12_p8d.c
+		pkcs12/p12_p8e.c
+		pkcs12/p12_utl.c
+		pkcs12/pk12err.c
+		pkcs7/bio_pk7.c
+		pkcs7/pk7_asn1.c
+		pkcs7/pk7_attr.c
+		pkcs7/pk7_doit.c
+		pkcs7/pk7_lib.c
+		pkcs7/pk7_mime.c
+		pkcs7/pk7_smime.c
+		pkcs7/pkcs7err.c
+		poly1305/poly1305.c
+		rand/rand_err.c
+		rand/rand_lib.c
+		rand/randfile.c
+		rc2/rc2_cbc.c
+		rc2/rc2_ecb.c
+		rc2/rc2_skey.c
+		rc2/rc2cfb64.c
+		rc2/rc2ofb64.c
+		ripemd/rmd_dgst.c
+		ripemd/rmd_one.c
+		rsa/rsa_ameth.c
+		rsa/rsa_asn1.c
+		rsa/rsa_chk.c
+		rsa/rsa_crpt.c
+		rsa/rsa_depr.c
+		rsa/rsa_eay.c
+		rsa/rsa_err.c
+		rsa/rsa_gen.c
+		rsa/rsa_lib.c
+		rsa/rsa_meth.c
+		rsa/rsa_none.c
+		rsa/rsa_oaep.c
+		rsa/rsa_pk1.c
+		rsa/rsa_pmeth.c
+		rsa/rsa_prn.c
+		rsa/rsa_pss.c
+		rsa/rsa_saos.c
+		rsa/rsa_sign.c
+		rsa/rsa_x931.c
+		sha/sha1_one.c
+		sha/sha1dgst.c
+		sha/sha256.c
+		sha/sha512.c
+		stack/stack.c
+		ts/ts_asn1.c
+		ts/ts_conf.c
+		ts/ts_err.c
+		ts/ts_lib.c
+		ts/ts_req_print.c
+		ts/ts_req_utils.c
+		ts/ts_rsp_print.c
+		ts/ts_rsp_sign.c
+		ts/ts_rsp_utils.c
+		ts/ts_rsp_verify.c
+		ts/ts_verify_ctx.c
+		txt_db/txt_db.c
+		ui/ui_err.c
+		ui/ui_lib.c
+		ui/ui_util.c
+		whrlpool/wp_dgst.c
+		x509/by_dir.c
+		x509/by_file.c
+		x509/by_mem.c
+		x509/x509_att.c
+		x509/x509_cmp.c
+		x509/x509_d2.c
+		x509/x509_def.c
+		x509/x509_err.c
+		x509/x509_ext.c
+		x509/x509_lu.c
+		x509/x509_obj.c
+		x509/x509_r2x.c
+		x509/x509_req.c
+		x509/x509_set.c
+		x509/x509_trs.c
+		x509/x509_txt.c
+		x509/x509_v3.c
+		x509/x509_vfy.c
+		x509/x509_vpm.c
+		x509/x509cset.c
+		x509/x509name.c
+		x509/x509rset.c
+		x509/x509spki.c
+		x509/x509type.c
+		x509/x_all.c
+		x509v3/pcy_cache.c
+		x509v3/pcy_data.c
+		x509v3/pcy_lib.c
+		x509v3/pcy_map.c
+		x509v3/pcy_node.c
+		x509v3/pcy_tree.c
+		x509v3/v3_akey.c
+		x509v3/v3_akeya.c
+		x509v3/v3_alt.c
+		x509v3/v3_bcons.c
+		x509v3/v3_bitst.c
+		x509v3/v3_conf.c
+		x509v3/v3_cpols.c
+		x509v3/v3_crld.c
+		x509v3/v3_enum.c
+		x509v3/v3_extku.c
+		x509v3/v3_genn.c
+		x509v3/v3_ia5.c
+		x509v3/v3_info.c
+		x509v3/v3_int.c
+		x509v3/v3_lib.c
+		x509v3/v3_ncons.c
+		x509v3/v3_ocsp.c
+		x509v3/v3_pci.c
+		x509v3/v3_pcia.c
+		x509v3/v3_pcons.c
+		x509v3/v3_pku.c
+		x509v3/v3_pmaps.c
+		x509v3/v3_prn.c
+		x509v3/v3_purp.c
+		x509v3/v3_skey.c
+		x509v3/v3_sxnet.c
+		x509v3/v3_utl.c
+		x509v3/v3err.c)
+
 if(HOST_ASM_ELF_X86_64)
-	set(
-		ASM_X86_64_ELF_SRC
+	set(ASM_X86_64_ELF_SRC
 		aes/aes-elf-x86_64.S
 		aes/bsaes-elf-x86_64.S
 		aes/vpaes-elf-x86_64.S
@@ -21,23 +556,24 @@ if(HOST_ASM_ELF_X86_64)
 		whrlpool/wp-elf-x86_64.S
 		cpuid-elf-x86_64.S
 	)
-	add_definitions(-DAES_ASM)
-	add_definitions(-DBSAES_ASM)
-	add_definitions(-DVPAES_ASM)
-	add_definitions(-DOPENSSL_IA32_SSE2)
-	add_definitions(-DOPENSSL_BN_ASM_MONT)
-	add_definitions(-DOPENSSL_BN_ASM_MONT5)
-	add_definitions(-DOPENSSL_BN_ASM_GF2m)
-	add_definitions(-DMD5_ASM)
-	add_definitions(-DGHASH_ASM)
-	add_definitions(-DRSA_ASM)
-	add_definitions(-DSHA1_ASM)
-	add_definitions(-DSHA256_ASM)
-	add_definitions(-DSHA512_ASM)
-	add_definitions(-DWHIRLPOOL_ASM)
-	add_definitions(-DOPENSSL_CPUID_OBJ)
-	set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC})
 	set_property(SOURCE ${ASM_X86_64_ELF_SRC} PROPERTY LANGUAGE C)
+	target_sources(crypto PRIVATE ${ASM_X86_64_ELF_SRC})
+	target_compile_definitions(crypto PRIVATE
+		AES_ASM
+		BSAES_ASM
+		VPAES_ASM
+		OPENSSL_IA32_SSE2
+		OPENSSL_BN_ASM_MONT
+		OPENSSL_BN_ASM_MONT5
+		OPENSSL_BN_ASM_GF2m
+		MD5_ASM
+		GHASH_ASM
+		RSA_ASM
+		SHA1_ASM
+		SHA256_ASM
+		SHA512_ASM
+		WHIRLPOOL_ASM
+		OPENSSL_CPUID_OBJ)
 endif()
 
 if(HOST_ASM_MACOSX_X86_64)
@@ -63,29 +599,28 @@ if(HOST_ASM_MACOSX_X86_64)
 		whrlpool/wp-macosx-x86_64.S
 		cpuid-macosx-x86_64.S
 	)
-	add_definitions(-DAES_ASM)
-	add_definitions(-DBSAES_ASM)
-	add_definitions(-DVPAES_ASM)
-	add_definitions(-DOPENSSL_IA32_SSE2)
-	add_definitions(-DOPENSSL_BN_ASM_MONT)
-	add_definitions(-DOPENSSL_BN_ASM_MONT5)
-	add_definitions(-DOPENSSL_BN_ASM_GF2m)
-	add_definitions(-DMD5_ASM)
-	add_definitions(-DGHASH_ASM)
-	add_definitions(-DRSA_ASM)
-	add_definitions(-DSHA1_ASM)
-	add_definitions(-DSHA256_ASM)
-	add_definitions(-DSHA512_ASM)
-	add_definitions(-DWHIRLPOOL_ASM)
-	add_definitions(-DOPENSSL_CPUID_OBJ)
-	set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC})
 	set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY LANGUAGE C)
+	target_sources(crypto PRIVATE ${ASM_X86_64_MACOSX_SRC})
+	target_compile_definitions(crypto PRIVATE
+		AES_ASM
+		BSAES_ASM
+		VPAES_ASM
+		OPENSSL_IA32_SSE2
+		OPENSSL_BN_ASM_MONT
+		OPENSSL_BN_ASM_MONT5
+		OPENSSL_BN_ASM_GF2m
+		MD5_ASM
+		GHASH_ASM
+		RSA_ASM
+		SHA1_ASM
+		SHA256_ASM
+		SHA512_ASM
+		WHIRLPOOL_ASM
+		OPENSSL_CPUID_OBJ)
 endif()
 
 if((NOT HOST_ASM_ELF_X86_64) AND (NOT HOST_ASM_MACOSX_X86_64))
-	set(
-		CRYPTO_SRC
-		${CRYPTO_SRC}
+	target_sources(crypto PRIVATE
 		aes/aes_cbc.c
 		aes/aes_core.c
 		camellia/camellia.c
@@ -96,559 +631,22 @@ if((NOT HOST_ASM_ELF_X86_64) AND (NOT HOST_ASM_MACOSX_X86_64))
 	)
 endif()
 
-set(
-	CRYPTO_SRC
-	${CRYPTO_SRC}
-	cpt_err.c
-	cryptlib.c
-	crypto_init.c
-	cversion.c
-	ex_data.c
-	malloc-wrapper.c
-	mem_clr.c
-	mem_dbg.c
-	o_init.c
-	o_str.c
-	o_time.c
-	aes/aes_cfb.c
-	aes/aes_ctr.c
-	aes/aes_ecb.c
-	aes/aes_ige.c
-	aes/aes_misc.c
-	aes/aes_ofb.c
-	aes/aes_wrap.c
-	asn1/a_bitstr.c
-	asn1/a_bool.c
-	asn1/a_bytes.c
-	asn1/a_d2i_fp.c
-	asn1/a_digest.c
-	asn1/a_dup.c
-	asn1/a_enum.c
-	asn1/a_i2d_fp.c
-	asn1/a_int.c
-	asn1/a_mbstr.c
-	asn1/a_object.c
-	asn1/a_octet.c
-	asn1/a_print.c
-	asn1/a_set.c
-	asn1/a_sign.c
-	asn1/a_strex.c
-	asn1/a_strnid.c
-	asn1/a_time.c
-	asn1/a_time_tm.c
-	asn1/a_type.c
-	asn1/a_utf8.c
-	asn1/a_verify.c
-	asn1/ameth_lib.c
-	asn1/asn1_err.c
-	asn1/asn1_gen.c
-	asn1/asn1_lib.c
-	asn1/asn1_par.c
-	asn1/asn_mime.c
-	asn1/asn_moid.c
-	asn1/asn_pack.c
-	asn1/bio_asn1.c
-	asn1/bio_ndef.c
-	asn1/d2i_pr.c
-	asn1/d2i_pu.c
-	asn1/evp_asn1.c
-	asn1/f_enum.c
-	asn1/f_int.c
-	asn1/f_string.c
-	asn1/i2d_pr.c
-	asn1/i2d_pu.c
-	asn1/n_pkey.c
-	asn1/nsseq.c
-	asn1/p5_pbe.c
-	asn1/p5_pbev2.c
-	asn1/p8_pkey.c
-	asn1/t_bitst.c
-	asn1/t_crl.c
-	asn1/t_pkey.c
-	asn1/t_req.c
-	asn1/t_spki.c
-	asn1/t_x509.c
-	asn1/t_x509a.c
-	asn1/tasn_dec.c
-	asn1/tasn_enc.c
-	asn1/tasn_fre.c
-	asn1/tasn_new.c
-	asn1/tasn_prn.c
-	asn1/tasn_typ.c
-	asn1/tasn_utl.c
-	asn1/x_algor.c
-	asn1/x_attrib.c
-	asn1/x_bignum.c
-	asn1/x_crl.c
-	asn1/x_exten.c
-	asn1/x_info.c
-	asn1/x_long.c
-	asn1/x_name.c
-	asn1/x_nx509.c
-	asn1/x_pkey.c
-	asn1/x_pubkey.c
-	asn1/x_req.c
-	asn1/x_sig.c
-	asn1/x_spki.c
-	asn1/x_val.c
-	asn1/x_x509.c
-	asn1/x_x509a.c
-	bf/bf_cfb64.c
-	bf/bf_ecb.c
-	bf/bf_enc.c
-	bf/bf_ofb64.c
-	bf/bf_skey.c
-	bio/b_dump.c
-	bio/b_print.c
-	bio/b_sock.c
-	bio/bf_buff.c
-	bio/bf_nbio.c
-	bio/bf_null.c
-	bio/bio_cb.c
-	bio/bio_err.c
-	bio/bio_lib.c
-	bio/bio_meth.c
-	bio/bss_acpt.c
-	bio/bss_bio.c
-	bio/bss_conn.c
-	bio/bss_dgram.c
-	bio/bss_fd.c
-	bio/bss_file.c
-	bio/bss_mem.c
-	bio/bss_null.c
-	bio/bss_sock.c
-	bn/bn_add.c
-	bn/bn_asm.c
-	bn/bn_blind.c
-	bn/bn_const.c
-	bn/bn_ctx.c
-	bn/bn_depr.c
-	bn/bn_div.c
-	bn/bn_err.c
-	bn/bn_exp.c
-	bn/bn_exp2.c
-	bn/bn_gcd.c
-	bn/bn_gf2m.c
-	bn/bn_kron.c
-	bn/bn_lib.c
-	bn/bn_mod.c
-	bn/bn_mont.c
-	bn/bn_mpi.c
-	bn/bn_mul.c
-	bn/bn_nist.c
-	bn/bn_prime.c
-	bn/bn_print.c
-	bn/bn_rand.c
-	bn/bn_recp.c
-	bn/bn_shift.c
-	bn/bn_sqr.c
-	bn/bn_sqrt.c
-	bn/bn_word.c
-	bn/bn_x931p.c
-	buffer/buf_err.c
-	buffer/buf_str.c
-	buffer/buffer.c
-	camellia/cmll_cfb.c
-	camellia/cmll_ctr.c
-	camellia/cmll_ecb.c
-	camellia/cmll_misc.c
-	camellia/cmll_ofb.c
-	cast/c_cfb64.c
-	cast/c_ecb.c
-	cast/c_enc.c
-	cast/c_ofb64.c
-	cast/c_skey.c
-	chacha/chacha.c
-	cmac/cm_ameth.c
-	cmac/cm_pmeth.c
-	cmac/cmac.c
-	comp/c_rle.c
-	comp/c_zlib.c
-	comp/comp_err.c
-	comp/comp_lib.c
-	conf/conf_api.c
-	conf/conf_def.c
-	conf/conf_err.c
-	conf/conf_lib.c
-	conf/conf_mall.c
-	conf/conf_mod.c
-	conf/conf_sap.c
-	curve25519/curve25519-generic.c
-	curve25519/curve25519.c
-	des/cbc_cksm.c
-	des/cbc_enc.c
-	des/cfb64ede.c
-	des/cfb64enc.c
-	des/cfb_enc.c
-	des/des_enc.c
-	des/ecb3_enc.c
-	des/ecb_enc.c
-	des/ede_cbcm_enc.c
-	des/enc_read.c
-	des/enc_writ.c
-	des/fcrypt.c
-	des/fcrypt_b.c
-	des/ofb64ede.c
-	des/ofb64enc.c
-	des/ofb_enc.c
-	des/pcbc_enc.c
-	des/qud_cksm.c
-	des/rand_key.c
-	des/set_key.c
-	des/str2key.c
-	des/xcbc_enc.c
-	dh/dh_ameth.c
-	dh/dh_asn1.c
-	dh/dh_check.c
-	dh/dh_depr.c
-	dh/dh_err.c
-	dh/dh_gen.c
-	dh/dh_key.c
-	dh/dh_lib.c
-	dh/dh_pmeth.c
-	dh/dh_prn.c
-	dsa/dsa_ameth.c
-	dsa/dsa_asn1.c
-	dsa/dsa_depr.c
-	dsa/dsa_err.c
-	dsa/dsa_gen.c
-	dsa/dsa_key.c
-	dsa/dsa_lib.c
-	dsa/dsa_meth.c
-	dsa/dsa_ossl.c
-	dsa/dsa_pmeth.c
-	dsa/dsa_prn.c
-	dsa/dsa_sign.c
-	dsa/dsa_vrf.c
-	dso/dso_dlfcn.c
-	dso/dso_err.c
-	dso/dso_lib.c
-	dso/dso_null.c
-	dso/dso_openssl.c
-	ec/ec2_mult.c
-	ec/ec2_oct.c
-	ec/ec2_smpl.c
-	ec/ec_ameth.c
-	ec/ec_asn1.c
-	ec/ec_check.c
-	ec/ec_curve.c
-	ec/ec_cvt.c
-	ec/ec_err.c
-	ec/ec_key.c
-	ec/ec_lib.c
-	ec/ec_mult.c
-	ec/ec_oct.c
-	ec/ec_pmeth.c
-	ec/ec_print.c
-	ec/eck_prn.c
-	ec/ecp_mont.c
-	ec/ecp_nist.c
-	ec/ecp_oct.c
-	ec/ecp_smpl.c
-	ecdh/ech_err.c
-	ecdh/ech_key.c
-	ecdh/ech_lib.c
-	ecdsa/ecs_asn1.c
-	ecdsa/ecs_err.c
-	ecdsa/ecs_lib.c
-	ecdsa/ecs_ossl.c
-	ecdsa/ecs_sign.c
-	ecdsa/ecs_vrf.c
-	engine/eng_all.c
-	engine/eng_cnf.c
-	engine/eng_ctrl.c
-	engine/eng_dyn.c
-	engine/eng_err.c
-	engine/eng_fat.c
-	engine/eng_init.c
-	engine/eng_lib.c
-	engine/eng_list.c
-	engine/eng_openssl.c
-	engine/eng_pkey.c
-	engine/eng_table.c
-	engine/tb_asnmth.c
-	engine/tb_cipher.c
-	engine/tb_dh.c
-	engine/tb_digest.c
-	engine/tb_dsa.c
-	engine/tb_ecdh.c
-	engine/tb_ecdsa.c
-	engine/tb_pkmeth.c
-	engine/tb_rand.c
-	engine/tb_rsa.c
-	engine/tb_store.c
-	err/err.c
-	err/err_all.c
-	err/err_prn.c
-	evp/bio_b64.c
-	evp/bio_enc.c
-	evp/bio_md.c
-	evp/c_all.c
-	evp/digest.c
-	evp/e_aes.c
-	evp/e_aes_cbc_hmac_sha1.c
-	evp/e_bf.c
-	evp/e_camellia.c
-	evp/e_cast.c
-	evp/e_chacha.c
-	evp/e_chacha20poly1305.c
-	evp/e_des.c
-	evp/e_des3.c
-	evp/e_gost2814789.c
-	evp/e_idea.c
-	evp/e_null.c
-	evp/e_old.c
-	evp/e_rc2.c
-	evp/e_rc4.c
-	evp/e_rc4_hmac_md5.c
-	evp/e_xcbc_d.c
-	evp/encode.c
-	evp/evp_aead.c
-	evp/evp_enc.c
-	evp/evp_err.c
-	evp/evp_key.c
-	evp/evp_lib.c
-	evp/evp_pbe.c
-	evp/evp_pkey.c
-	evp/m_dss.c
-	evp/m_dss1.c
-	evp/m_ecdsa.c
-	evp/m_gost2814789.c
-	evp/m_gostr341194.c
-	evp/m_md4.c
-	evp/m_md5.c
-	evp/m_md5_sha1.c
-	evp/m_null.c
-	evp/m_ripemd.c
-	evp/m_sha1.c
-	evp/m_sigver.c
-	evp/m_streebog.c
-	evp/m_wp.c
-	evp/names.c
-	evp/p5_crpt.c
-	evp/p5_crpt2.c
-	evp/p_dec.c
-	evp/p_enc.c
-	evp/p_lib.c
-	evp/p_open.c
-	evp/p_seal.c
-	evp/p_sign.c
-	evp/p_verify.c
-	evp/pmeth_fn.c
-	evp/pmeth_gn.c
-	evp/pmeth_lib.c
-	gost/gost2814789.c
-	gost/gost89_keywrap.c
-	gost/gost89_params.c
-	gost/gost89imit_ameth.c
-	gost/gost89imit_pmeth.c
-	gost/gost_asn1.c
-	gost/gost_err.c
-	gost/gostr341001.c
-	gost/gostr341001_ameth.c
-	gost/gostr341001_key.c
-	gost/gostr341001_params.c
-	gost/gostr341001_pmeth.c
-	gost/gostr341194.c
-	gost/streebog.c
-	hkdf/hkdf.c
-	hmac/hm_ameth.c
-	hmac/hm_pmeth.c
-	hmac/hmac.c
-	idea/i_cbc.c
-	idea/i_cfb64.c
-	idea/i_ecb.c
-	idea/i_ofb64.c
-	idea/i_skey.c
-	lhash/lh_stats.c
-	lhash/lhash.c
-	md4/md4_dgst.c
-	md4/md4_one.c
-	md5/md5_dgst.c
-	md5/md5_one.c
-	modes/cbc128.c
-	modes/ccm128.c
-	modes/cfb128.c
-	modes/ctr128.c
-	modes/cts128.c
-	modes/gcm128.c
-	modes/ofb128.c
-	modes/xts128.c
-	objects/o_names.c
-	objects/obj_dat.c
-	objects/obj_err.c
-	objects/obj_lib.c
-	objects/obj_xref.c
-	ocsp/ocsp_asn.c
-	ocsp/ocsp_cl.c
-	ocsp/ocsp_err.c
-	ocsp/ocsp_ext.c
-	ocsp/ocsp_ht.c
-	ocsp/ocsp_lib.c
-	ocsp/ocsp_prn.c
-	ocsp/ocsp_srv.c
-	ocsp/ocsp_vfy.c
-	pem/pem_all.c
-	pem/pem_err.c
-	pem/pem_info.c
-	pem/pem_lib.c
-	pem/pem_oth.c
-	pem/pem_pk8.c
-	pem/pem_pkey.c
-	pem/pem_seal.c
-	pem/pem_sign.c
-	pem/pem_x509.c
-	pem/pem_xaux.c
-	pem/pvkfmt.c
-	pkcs12/p12_add.c
-	pkcs12/p12_asn.c
-	pkcs12/p12_attr.c
-	pkcs12/p12_crpt.c
-	pkcs12/p12_crt.c
-	pkcs12/p12_decr.c
-	pkcs12/p12_init.c
-	pkcs12/p12_key.c
-	pkcs12/p12_kiss.c
-	pkcs12/p12_mutl.c
-	pkcs12/p12_npas.c
-	pkcs12/p12_p8d.c
-	pkcs12/p12_p8e.c
-	pkcs12/p12_utl.c
-	pkcs12/pk12err.c
-	pkcs7/bio_pk7.c
-	pkcs7/pk7_asn1.c
-	pkcs7/pk7_attr.c
-	pkcs7/pk7_doit.c
-	pkcs7/pk7_lib.c
-	pkcs7/pk7_mime.c
-	pkcs7/pk7_smime.c
-	pkcs7/pkcs7err.c
-	poly1305/poly1305.c
-	rand/rand_err.c
-	rand/rand_lib.c
-	rand/randfile.c
-	rc2/rc2_cbc.c
-	rc2/rc2_ecb.c
-	rc2/rc2_skey.c
-	rc2/rc2cfb64.c
-	rc2/rc2ofb64.c
-	ripemd/rmd_dgst.c
-	ripemd/rmd_one.c
-	rsa/rsa_ameth.c
-	rsa/rsa_asn1.c
-	rsa/rsa_chk.c
-	rsa/rsa_crpt.c
-	rsa/rsa_depr.c
-	rsa/rsa_eay.c
-	rsa/rsa_err.c
-	rsa/rsa_gen.c
-	rsa/rsa_lib.c
-	rsa/rsa_meth.c
-	rsa/rsa_none.c
-	rsa/rsa_oaep.c
-	rsa/rsa_pk1.c
-	rsa/rsa_pmeth.c
-	rsa/rsa_prn.c
-	rsa/rsa_pss.c
-	rsa/rsa_saos.c
-	rsa/rsa_sign.c
-	rsa/rsa_x931.c
-	sha/sha1_one.c
-	sha/sha1dgst.c
-	sha/sha256.c
-	sha/sha512.c
-	stack/stack.c
-	ts/ts_asn1.c
-	ts/ts_conf.c
-	ts/ts_err.c
-	ts/ts_lib.c
-	ts/ts_req_print.c
-	ts/ts_req_utils.c
-	ts/ts_rsp_print.c
-	ts/ts_rsp_sign.c
-	ts/ts_rsp_utils.c
-	ts/ts_rsp_verify.c
-	ts/ts_verify_ctx.c
-	txt_db/txt_db.c
-	ui/ui_err.c
-	ui/ui_lib.c
-	ui/ui_util.c
-	whrlpool/wp_dgst.c
-	x509/by_dir.c
-	x509/by_file.c
-	x509/by_mem.c
-	x509/x509_att.c
-	x509/x509_cmp.c
-	x509/x509_d2.c
-	x509/x509_def.c
-	x509/x509_err.c
-	x509/x509_ext.c
-	x509/x509_lu.c
-	x509/x509_obj.c
-	x509/x509_r2x.c
-	x509/x509_req.c
-	x509/x509_set.c
-	x509/x509_trs.c
-	x509/x509_txt.c
-	x509/x509_v3.c
-	x509/x509_vfy.c
-	x509/x509_vpm.c
-	x509/x509cset.c
-	x509/x509name.c
-	x509/x509rset.c
-	x509/x509spki.c
-	x509/x509type.c
-	x509/x_all.c
-	x509v3/pcy_cache.c
-	x509v3/pcy_data.c
-	x509v3/pcy_lib.c
-	x509v3/pcy_map.c
-	x509v3/pcy_node.c
-	x509v3/pcy_tree.c
-	x509v3/v3_akey.c
-	x509v3/v3_akeya.c
-	x509v3/v3_alt.c
-	x509v3/v3_bcons.c
-	x509v3/v3_bitst.c
-	x509v3/v3_conf.c
-	x509v3/v3_cpols.c
-	x509v3/v3_crld.c
-	x509v3/v3_enum.c
-	x509v3/v3_extku.c
-	x509v3/v3_genn.c
-	x509v3/v3_ia5.c
-	x509v3/v3_info.c
-	x509v3/v3_int.c
-	x509v3/v3_lib.c
-	x509v3/v3_ncons.c
-	x509v3/v3_ocsp.c
-	x509v3/v3_pci.c
-	x509v3/v3_pcia.c
-	x509v3/v3_pcons.c
-	x509v3/v3_pku.c
-	x509v3/v3_pmaps.c
-	x509v3/v3_prn.c
-	x509v3/v3_purp.c
-	x509v3/v3_skey.c
-	x509v3/v3_sxnet.c
-	x509v3/v3_utl.c
-	x509v3/v3err.c
-)
-
 if(UNIX)
-	set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_posix.c)
-	set(CRYPTO_SRC ${CRYPTO_SRC} bio/bss_log.c)
-	set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl.c)
+	target_sources(crypto PRIVATE
+		bio/b_posix.c
+		bio/bss_log.c
+		ui/ui_openssl.c)
 endif()
 
 if(WIN32)
-	set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c)
+	target_sources(crypto PRIVATE
+		bio/b_win.c
+		ui/ui_openssl_win.c)
 	set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log)
-	set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c)
 endif()
 
 if(WIN32)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/posix_win.c)
+	target_sources(crypto PRIVATE compat/posix_win.c)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} gettimeofday)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_perror)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} posix_fopen)
@@ -665,125 +663,126 @@ if(WIN32)
 endif()
 
 if(NOT HAVE_ASPRINTF)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/bsd-asprintf.c)
+	target_sources(crypto PRIVATE compat/bsd-asprintf.c)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} asprintf)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} vasprintf)
 endif()
 
 if(NOT HAVE_FREEZERO)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/freezero.c)
+	target_sources(crypto PRIVATE compat/freezero.c)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} freezero)
 endif()
 
 if(NOT HAVE_GETPAGESIZE)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/getpagesize.c)
+	target_sources(crypto PRIVATE compat/getpagesize.c)
 endif()
 
 if(NOT HAVE_REALLOCARRAY)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/reallocarray.c)
+	target_sources(crypto PRIVATE compat/reallocarray.c)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} reallocarray)
 endif()
 
 if(NOT HAVE_RECALLOCARRAY)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/recallocarray.c)
+	target_sources(crypto PRIVATE compat/recallocarray.c)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} recallocarray)
 endif()
 
 if(NOT HAVE_STRCASECMP)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/strcasecmp.c)
+	target_sources(crypto PRIVATE compat/strcasecmp.c)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} strcasecmp)
 endif()
 
 if(NOT HAVE_STRLCAT)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcat.c)
+	target_sources(crypto PRIVATE compat/strlcat.c)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcat)
 endif()
 
 if(NOT HAVE_STRLCPY)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/strlcpy.c)
+	target_sources(crypto PRIVATE compat/strlcpy.c)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} strlcpy)
 endif()
 
 if(NOT HAVE_STRNDUP)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/strndup.c)
+	target_sources(crypto PRIVATE compat/strndup.c)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} strndup)
 	if(NOT HAVE_STRNLEN)
-		set(CRYPTO_SRC ${CRYPTO_SRC} compat/strnlen.c)
+		target_sources(crypto PRIVATE compat/strnlen.c)
 		set(EXTRA_EXPORT ${EXTRA_EXPORT} strnlen)
 	endif()
 endif()
 
 if(NOT HAVE_STRSEP)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/strsep.c)
+	target_sources(crypto PRIVATE compat/strsep.c)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} strsep)
 endif()
 
 if(NOT HAVE_TIMEGM)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/timegm.c)
+	target_sources(crypto PRIVATE compat/timegm.c)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} timegm)
 endif()
 
 if(NOT HAVE_EXPLICIT_BZERO)
 	if(WIN32)
-		set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero_win.c)
+		target_sources(crypto PRIVATE compat/explicit_bzero_win.c)
 	else()
-		set(CRYPTO_SRC ${CRYPTO_SRC} compat/explicit_bzero.c)
+		target_sources(crypto PRIVATE compat/explicit_bzero.c)
 		set_source_files_properties(compat/explicit_bzero.c PROPERTIES COMPILE_FLAGS -O0)
 	endif()
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} explicit_bzero)
 endif()
 
 if(NOT HAVE_ARC4RANDOM_BUF)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random.c)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/arc4random_uniform.c)
+	target_sources(crypto PRIVATE
+			compat/arc4random.c
+			compat/arc4random_uniform.c)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_buf)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} arc4random_uniform)
 
 	if(NOT HAVE_GETENTROPY)
 		if(WIN32)
-			set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_win.c)
+			target_sources(crypto PRIVATE compat/getentropy_win.c)
 		elseif(CMAKE_SYSTEM_NAME MATCHES "AIX")
-			set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_aix.c)
+			target_sources(crypto PRIVATE compat/getentropy_aix.c)
 		elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-			set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_freebsd.c)
+			target_sources(crypto PRIVATE compat/getentropy_freebsd.c)
 		elseif(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
-			set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_hpux.c)
+			target_sources(crypto PRIVATE compat/getentropy_hpux.c)
 		elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-			set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_linux.c)
+			target_sources(crypto PRIVATE compat/getentropy_linux.c)
 		elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-			set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_netbsd.c)
+			target_sources(crypto PRIVATE compat/getentropy_netbsd.c)
 		elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-			set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_osx.c)
+			target_sources(crypto PRIVATE compat/getentropy_osx.c)
 		elseif(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-			set(CRYPTO_SRC ${CRYPTO_SRC} compat/getentropy_solaris.c)
+			target_sources(crypto PRIVATE compat/getentropy_solaris.c)
 		endif()
 		set(EXTRA_EXPORT ${EXTRA_EXPORT} getentropy)
 	endif()
 endif()
 
 if(NOT HAVE_TIMINGSAFE_BCMP)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_bcmp.c)
+	target_sources(crypto PRIVATE compat/timingsafe_bcmp.c)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_bcmp)
 endif()
 
 if(NOT HAVE_TIMINGSAFE_MEMCMP)
-	set(CRYPTO_SRC ${CRYPTO_SRC} compat/timingsafe_memcmp.c)
+	target_sources(crypto PRIVATE compat/timingsafe_memcmp.c)
 	set(EXTRA_EXPORT ${EXTRA_EXPORT} timingsafe_memcmp)
 endif()
 
 if(NOT ENABLE_ASM)
-	add_definitions(-DOPENSSL_NO_ASM)
+	target_compile_definitions(crypto PRIVATE OPENSSL_NO_ASM)
 else()
 	if(WIN32)
-		add_definitions(-DOPENSSL_NO_ASM)
+		target_compile_definitions(crypto PRIVATE OPENSSL_NO_ASM)
 	endif()
 endif()
 
 if(NOT "${OPENSSLDIR}" STREQUAL "")
-	add_definitions(-DOPENSSLDIR=\"${OPENSSLDIR}\")
+	target_compile_definitions(crypto PRIVATE OPENSSLDIR=\"${OPENSSLDIR}\")
 else()
-	add_definitions(-DOPENSSLDIR=\"${CMAKE_INSTALL_PREFIX}/etc/ssl\")
+	target_compile_definitions(crypto PRIVATE OPENSSLDIR=\"${CMAKE_INSTALL_PREFIX}/etc/ssl\")
 endif()
 
 file(READ ${CMAKE_CURRENT_SOURCE_DIR}/crypto.sym SYMS)
@@ -798,7 +797,6 @@ if(EXTRA_EXPORT)
 	endforeach()
 endif()
 
-add_library(crypto ${CRYPTO_SRC})
 target_include_directories(crypto
 		PRIVATE
 			.
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index a1ce693..2e03e6a 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -1,5 +1,4 @@
-set(
-	SSL_SRC
+add_library(ssl
 	bio_ssl.c
 	bs_ber.c
 	bs_cbb.c
@@ -41,7 +40,6 @@ set(
 	t1_srvr.c
 )
 
-add_library(ssl ${SSL_SRC})
 target_include_directories(ssl
 		PRIVATE
 			.
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index 0c8d731..219ca5c 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -1,5 +1,4 @@
-set(
-	TLS_SRC
+add_library(tls
 	tls.c
 	tls_bio_cb.c
 	tls_client.c
@@ -14,9 +13,7 @@ set(
 )
 
 if(WIN32)
-	set(
-		TLS_SRC
-		${TLS_SRC}
+	target_sources(tls PRIVATE
 		compat/ftruncate.c
 		compat/getuid.c
 		compat/pread.c
@@ -25,12 +22,11 @@ if(WIN32)
 endif()
 
 if(NOT "${OPENSSLDIR}" STREQUAL "")
-	add_definitions(-D_PATH_SSL_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
+	target_compile_definitions(tls PRIVATE _PATH_SSL_CA_FILE=\"${OPENSSLDIR}/cert.pem\")
 else()
-	add_definitions(-D_PATH_SSL_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\")
+	target_compile_definitions(tls PRIVATE _PATH_SSL_CA_FILE=\"${CMAKE_INSTALL_PREFIX}/etc/ssl/cert.pem\")
 endif()
 
-add_library(tls ${TLS_SRC})
 target_include_directories(tls
 		PRIVATE
 			.