From 9f6d0c730b8834738da201b7062f67c2d819cb02 Mon Sep 17 00:00:00 2001 From: Henri Manson Date: Thu, 21 Feb 2019 18:14:43 +0100 Subject: [PATCH 1/5] temporary preview --- cmake/MacroASN1Module.cmake | 4 ++-- lib/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/MacroASN1Module.cmake b/cmake/MacroASN1Module.cmake index c43d345..b78cd33 100644 --- a/cmake/MacroASN1Module.cmake +++ b/cmake/MacroASN1Module.cmake @@ -69,12 +69,12 @@ macro(add_asn1_module _modulename _groupname) # and install the header file to include/quick-der/modulename.h. set(_ppath $ENV{PYTHONPATH}) add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/quick-der/${_modulename}.h - COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_SOURCE_DIR}/python:${_ppath} ${_qd_asn2quickder} -l c ${asn1module_asn2quickder_options} ${CMAKE_CURRENT_SOURCE_DIR}/${_modulename}.asn1 + COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_SOURCE_DIR}/python python ${_qd_asn2quickder} -l c ${asn1module_asn2quickder_options} ${CMAKE_CURRENT_SOURCE_DIR}/${_modulename}.asn1 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_modulename}.asn1 WORKING_DIRECTORY quick-der COMMENT "Build include file ${_modulename}.h from ASN.1 spec") add_custom_command (OUTPUT ${CMAKE_BINARY_DIR}/python/testing/${_modulename}.py - COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_SOURCE_DIR}/python:${_ppath} ${_qd_asn2quickder} -l python ${asn1module_asn2quickder_options} ${CMAKE_CURRENT_SOURCE_DIR}/${_modulename}.asn1 + COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_SOURCE_DIR}/python python ${_qd_asn2quickder} -l python ${asn1module_asn2quickder_options} ${CMAKE_CURRENT_SOURCE_DIR}/${_modulename}.asn1 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_modulename}.asn1 WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/python/testing COMMENT "Build Python script ${_modulename}.py from ASN.1 spec") diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index cc6aa53..43c7a1d 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -40,6 +40,7 @@ set_target_properties (quickderStatic # need an extra quick-der/ level because that's retained in the file paths. install (TARGETS quickderShared LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include/quick-der) install (TARGETS quickderStatic ARCHIVE DESTINATION lib) From 2312d6cb6def4be8de4f89f6f2d888f3f5be67f5 Mon Sep 17 00:00:00 2001 From: Henri Manson Date: Thu, 28 Feb 2019 10:15:22 +0100 Subject: [PATCH 2/5] python path fix, python interpreter fix --- cmake/MacroASN1Module.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/MacroASN1Module.cmake b/cmake/MacroASN1Module.cmake index 1500e77..b8bcdee 100644 --- a/cmake/MacroASN1Module.cmake +++ b/cmake/MacroASN1Module.cmake @@ -119,7 +119,7 @@ endmacro() macro(add_asn1_document _docname _groupname) add_custom_command (OUTPUT doc/${_docname}.md - COMMAND ${CMAKE_SOURCE_DIR}/python/scripts/asn1literate ${CMAKE_CURRENT_SOURCE_DIR}/${_docname}.asn1 ${_docname}.md + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/python/scripts/asn1literate ${CMAKE_CURRENT_SOURCE_DIR}/${_docname}.asn1 ${_docname}.md DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_docname}.asn1 WORKING_DIRECTORY doc COMMENT "Build markdown text file ${_docname}.md from ASN.1 spec") From 2cbd3b19fbd22460e4933f6eecd089e7b5dc177c Mon Sep 17 00:00:00 2001 From: Henri Manson Date: Thu, 28 Feb 2019 10:36:15 +0100 Subject: [PATCH 3/5] windows test --- cmake/PythonSupport.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/PythonSupport.cmake b/cmake/PythonSupport.cmake index 9dbf046..77fe29a 100644 --- a/cmake/PythonSupport.cmake +++ b/cmake/PythonSupport.cmake @@ -11,7 +11,7 @@ # SPDX-License-Identifier: BSD-2-Clause.degroot # License-Filename: LICENSES/BSD-2-Clause.degroot -if (WIN32) +if("${CMAKE_HOST_SYSTEM}" MATCHES ".*Windows.*") set (PYTHON_PATH_SEPARATOR ";") else() set (PYTHON_PATH_SEPARATOR ":") From 70cbe3c3c860b3087c3dc2f452a579622be7b0ce Mon Sep 17 00:00:00 2001 From: Henri Manson Date: Wed, 6 Mar 2019 14:20:18 +0100 Subject: [PATCH 4/5] don't re-find python interpreter when PYTHON_FOUND is set --- cmake/PythonSupport.cmake | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/cmake/PythonSupport.cmake b/cmake/PythonSupport.cmake index 77fe29a..d92ed57 100644 --- a/cmake/PythonSupport.cmake +++ b/cmake/PythonSupport.cmake @@ -41,21 +41,21 @@ endfunction() macro (FindPythonInterpreter) if (NOT PYTHON_FOUND) message (STATUS "Looking for Python") - endif() - if ( CMAKE_VERSION VERSION_GREATER 3.12 ) - find_package (Python) - if (NOT Python_Interpreter_FOUND ) - message (FATAL_ERROR "No Python interpreter found") - else() - set (PYTHON_EXECUTABLE ${Python_EXECUTABLE}) - endif() - set (PYTHON_FOUND ${Python_Interpreter_FOUND}) - else() - # set( Python_ADDITIONAL_VERSIONS "3" "3.5" "3.6" "3.7" ) - find_package (PythonInterp) - if (NOT PYTHONINTERP_FOUND) - message (FATAL_ERROR "No Python interpreter found.") - endif() - set (PYTHON_FOUND ${PYTHONINTERP_FOUND}) + if ( CMAKE_VERSION VERSION_GREATER 3.12 ) + find_package (Python) + if (NOT Python_Interpreter_FOUND ) + message (FATAL_ERROR "No Python interpreter found") + else() + set (PYTHON_EXECUTABLE ${Python_EXECUTABLE}) + endif() + set (PYTHON_FOUND ${Python_Interpreter_FOUND}) + else() + # set( Python_ADDITIONAL_VERSIONS "3" "3.5" "3.6" "3.7" ) + find_package (PythonInterp) + if (NOT PYTHONINTERP_FOUND) + message (FATAL_ERROR "No Python interpreter found.") + endif() + set (PYTHON_FOUND ${PYTHONINTERP_FOUND}) + endif() endif() endmacro() From 8a6197af4cd4f798030d2fb4e6e283226c6dc482 Mon Sep 17 00:00:00 2001 From: hfmanson Date: Wed, 13 Mar 2019 21:50:54 +0100 Subject: [PATCH 5/5] import library --- contrib/cmake/Quick-DERConfig.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/cmake/Quick-DERConfig.cmake.in b/contrib/cmake/Quick-DERConfig.cmake.in index d557127..97e800c 100644 --- a/contrib/cmake/Quick-DERConfig.cmake.in +++ b/contrib/cmake/Quick-DERConfig.cmake.in @@ -11,7 +11,7 @@ set(Quick-DER_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@") get_filename_component( Quick-DER_LIBRARIES - "${Quick-DER_LIB_DIRS}/libquickder${CMAKE_SHARED_LIBRARY_SUFFIX}" + "${Quick-DER_LIB_DIRS}/libquickder${CMAKE_IMPORT_LIBRARY_SUFFIX}" ABSOLUTE )