Mercurial > hg > orthanc

comparison Resources/CMake/OpenSslConfiguration.cmake @ 672:670dd1f2edab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improvements to cmake
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 19 Nov 2013 15:57:28 +0100
parents d775a3cb5a06
children ee0d5abf7958
comparison
equal deleted inserted replaced
671:7131193b0e4b 672:670dd1f2edab
1 if (STATIC_BUILD) 1 if (STATIC_BUILD OR NOT USE_SYSTEM_OPENSSL)
2 SET(OPENSSL_SOURCES_DIR ${CMAKE_BINARY_DIR}/openssl-1.0.1c) 2 SET(OPENSSL_SOURCES_DIR ${CMAKE_BINARY_DIR}/openssl-1.0.1c)
3 DownloadPackage( 3 DownloadPackage(
4 "ae412727c8c15b67880aef7bd2999b2e" 4 "ae412727c8c15b67880aef7bd2999b2e"
5 "www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/openssl-1.0.1c.tar.gz" 5 "www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/openssl-1.0.1c.tar.gz"
6 "${OPENSSL_SOURCES_DIR}") 6 "${OPENSSL_SOURCES_DIR}")
178 ${OPENSSL_SOURCES_DIR}/crypto/dh/dhtest.c 178 ${OPENSSL_SOURCES_DIR}/crypto/dh/dhtest.c
179 ${OPENSSL_SOURCES_DIR}/crypto/pqueue/pq_test.c 179 ${OPENSSL_SOURCES_DIR}/crypto/pqueue/pq_test.c
180 ${OPENSSL_SOURCES_DIR}/crypto/des/ncbc_enc.c 180 ${OPENSSL_SOURCES_DIR}/crypto/des/ncbc_enc.c
181 ) 181 )
182 182
183 #if (${MSVC}) 183 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
184 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
185 set_source_files_properties( 184 set_source_files_properties(
186 ${OPENSSL_SOURCES} 185 ${OPENSSL_SOURCES}
187 PROPERTIES COMPILE_DEFINITIONS 186 PROPERTIES COMPILE_DEFINITIONS
188 "OPENSSL_SYSNAME_WIN32;SO_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN") 187 "OPENSSL_SYSNAME_WIN32;SO_WIN32;WIN32_LEAN_AND_MEAN;L_ENDIAN")
189 188
190 elseif (${CMAKE_SYSTEM_VERSION} STREQUAL "LinuxStandardBase") 189 elseif ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
191 execute_process( 190 execute_process(
192 COMMAND patch ui_openssl.c ${CMAKE_SOURCE_DIR}/Resources/Patches/openssl-lsb.diff 191 COMMAND patch ui_openssl.c ${CMAKE_SOURCE_DIR}/Resources/Patches/openssl-lsb.diff
193 WORKING_DIRECTORY ${OPENSSL_SOURCES_DIR}/crypto/ui 192 WORKING_DIRECTORY ${OPENSSL_SOURCES_DIR}/crypto/ui
194 ) 193 )
194
195 endif() 195 endif()
196 196
197 #add_library(OpenSSL STATIC ${OPENSSL_SOURCES}) 197 #add_library(OpenSSL STATIC ${OPENSSL_SOURCES})
198 #link_libraries(OpenSSL) 198 #link_libraries(OpenSSL)
199 199