aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorDon <don.j.olmstead@gmail.com>2018-03-16 12:15:30 -0700
committerDon <don.j.olmstead@gmail.com>2018-03-16 12:15:30 -0700
commit3625c50f44da03b39577219dc2013bf02f76fc9a (patch)
treebb56c329b754d9764f7b6292a36c2c99b9523603 /crypto
parent639a6629ae4b2243d1d15670f90750c3200ff4bf (diff)
downloadportable-3625c50f44da03b39577219dc2013bf02f76fc9a.tar.gz
portable-3625c50f44da03b39577219dc2013bf02f76fc9a.tar.bz2
portable-3625c50f44da03b39577219dc2013bf02f76fc9a.zip
Use binary directory for symbol exports generation
Currently the CMake files generate symbols into the source tree when they should go into the build tree.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 0615110..afa57b3 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -798,11 +798,11 @@ file(READ ${CMAKE_CURRENT_SOURCE_DIR}/crypto.sym SYMS)
798foreach(SYM IN LISTS CRYPTO_UNEXPORT) 798foreach(SYM IN LISTS CRYPTO_UNEXPORT)
799 string(REPLACE "${SYM}\n" "" SYMS ${SYMS}) 799 string(REPLACE "${SYM}\n" "" SYMS ${SYMS})
800endforeach() 800endforeach()
801file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/crypto_p.sym ${SYMS}) 801file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym ${SYMS})
802if(EXTRA_EXPORT) 802if(EXTRA_EXPORT)
803 list(SORT EXTRA_EXPORT) 803 list(SORT EXTRA_EXPORT)
804 foreach(SYM IN LISTS EXTRA_EXPORT) 804 foreach(SYM IN LISTS EXTRA_EXPORT)
805 file(APPEND ${CMAKE_CURRENT_SOURCE_DIR}/crypto_p.sym "${SYM}\n") 805 file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym "${SYM}\n")
806 endforeach() 806 endforeach()
807endif() 807endif()
808 808
@@ -810,7 +810,7 @@ add_library(crypto-objects OBJECT ${CRYPTO_SRC})
810if (BUILD_SHARED) 810if (BUILD_SHARED)
811 add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>) 811 add_library(crypto STATIC $<TARGET_OBJECTS:crypto-objects>)
812 add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>) 812 add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>)
813 export_symbol(crypto-shared ${CMAKE_CURRENT_SOURCE_DIR}/crypto_p.sym) 813 export_symbol(crypto-shared ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym)
814 if (WIN32) 814 if (WIN32)
815 target_link_libraries(crypto-shared Ws2_32.lib) 815 target_link_libraries(crypto-shared Ws2_32.lib)
816 set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION}) 816 set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION})