diff -Nru opencad-0.3.3+16/cmake/FindAnyProject.cmake opencad-0.3.3+17/cmake/FindAnyProject.cmake --- opencad-0.3.3+16/cmake/FindAnyProject.cmake 2018-02-19 21:25:37.000000000 +0000 +++ opencad-0.3.3+17/cmake/FindAnyProject.cmake 2018-04-07 23:56:05.000000000 +0000 @@ -37,7 +37,7 @@ set(options OPTIONAL REQUIRED QUIET EXACT MODULE) set(oneValueArgs DEFAULT VERSION SHARED) - set(multiValueArgs CMAKE_ARGS COMPONENTS) + set(multiValueArgs CMAKE_ARGS COMPONENTS NAMES) cmake_parse_arguments(find_anyproject "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) if(find_anyproject_REQUIRED OR find_anyproject_DEFAULT) @@ -91,8 +91,13 @@ set(FIND_PROJECT_ARG ${FIND_PROJECT_ARG} COMPONENTS ${find_anyproject_COMPONENTS}) endif() + set(FIND_PROJECT_CONFIG_ARG ${FIND_PROJECT_ARG}) + if(find_anyproject_NAMES) + set(FIND_PROJECT_CONFIG_ARG ${FIND_PROJECT_CONFIG_ARG} NAMES ${find_anyproject_NAMES}) + endif() + if(NOT CMAKE_CROSSCOMPILING) - find_package(${name} ${FIND_PROJECT_ARG} CONFIG QUIET) + find_package(${name} ${FIND_PROJECT_CONFIG_ARG} CONFIG QUIET) if(${name}_FOUND AND (${name}_RUN_IN_MODULE_MODE OR ${UPPER_NAME}_RUN_IN_MODULE_MODE)) find_package(${name} ${FIND_PROJECT_ARG} MODULE QUIET) endif() @@ -132,15 +137,19 @@ set(${VERSION_STRING} ${${VERSION_STRING}} CACHE INTERNAL "version ${name}") if(${UPPER_NAME}_INCLUDE_DIRS) set(${UPPER_NAME}_INCLUDE_DIRS ${${UPPER_NAME}_INCLUDE_DIRS} CACHE INTERNAL "include directories ${name}") + set(${UPPER_NAME}_INCLUDE_DIR ${${UPPER_NAME}_INCLUDE_DIRS}) endif() if(${UPPER_NAME}_INCLUDE_DIR) set(${UPPER_NAME}_INCLUDE_DIR ${${UPPER_NAME}_INCLUDE_DIR} CACHE INTERNAL "include directories ${name}") + set(${UPPER_NAME}_INCLUDE_DIRS ${${UPPER_NAME}_INCLUDE_DIR}) endif() if(${UPPER_NAME}_LIBRARIES) set(${UPPER_NAME}_LIBRARIES ${${UPPER_NAME}_LIBRARIES} CACHE INTERNAL "library ${name}") + set(${UPPER_NAME}_LIBRARY ${${UPPER_NAME}_LIBRARIES}) endif() if(${UPPER_NAME}_LIBRARY) set(${UPPER_NAME}_LIBRARY ${${UPPER_NAME}_LIBRARY} CACHE INTERNAL "library ${name}") + set(${UPPER_NAME}_LIBRARIES ${${UPPER_NAME}_LIBRARY}) endif() if(${UPPER_NAME}_VERSION) set(${UPPER_NAME}_VERSION ${${UPPER_NAME}_VERSION} CACHE INTERNAL "library ${name} version") diff -Nru opencad-0.3.3+16/cmake/FindExtProject.cmake opencad-0.3.3+17/cmake/FindExtProject.cmake --- opencad-0.3.3+16/cmake/FindExtProject.cmake 2018-02-20 13:23:50.000000000 +0000 +++ opencad-0.3.3+17/cmake/FindExtProject.cmake 2018-04-07 23:56:05.000000000 +0000 @@ -35,15 +35,15 @@ get_compiler_version(COMPILER) if(repo_type STREQUAL "github") # TODO: Add gitlab here. - if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/latest.json) + if(NOT EXISTS ${CMAKE_BINARY_DIR}/${repo}_latest.json) file(DOWNLOAD https://api.github.com/repos/${repo}/releases/latest - ${CMAKE_CURRENT_BINARY_DIR}/${repo}_latest.json + ${CMAKE_BINARY_DIR}/${repo}_latest.json TLS_VERIFY OFF ) endif() # Get assets files. - file(READ ${CMAKE_CURRENT_BINARY_DIR}/${repo}_latest.json _JSON_CONTENTS) + file(READ ${CMAKE_BINARY_DIR}/${repo}_latest.json _JSON_CONTENTS) if(BUILD_STATIC_LIBS) set(STATIC_PREFIX "static-") @@ -73,7 +73,7 @@ function(find_extproject name) set(options OPTIONAL EXACT) set(oneValueArgs VERSION SHARED) - set(multiValueArgs CMAKE_ARGS) + set(multiValueArgs CMAKE_ARGS COMPONENTS NAMES) cmake_parse_arguments(find_extproject "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) # Set default third party lib path. @@ -99,10 +99,10 @@ if(BINARY_URL) # Download binary build files. - if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/${name}.zip) + if(NOT EXISTS ${CMAKE_BINARY_DIR}/${name}.zip) file(DOWNLOAD ${BINARY_URL} - ${CMAKE_CURRENT_BINARY_DIR}/${name}.zip + ${CMAKE_BINARY_DIR}/${name}.zip TLS_VERIFY OFF ) endif() @@ -112,7 +112,7 @@ COMMAND ${CMAKE_COMMAND} -E make_directory ${EXT_INSTALL_DIR} ) execute_process( - COMMAND ${CMAKE_COMMAND} -E tar xfz ${CMAKE_CURRENT_BINARY_DIR}/${name}.zip + COMMAND ${CMAKE_COMMAND} -E tar xfz ${CMAKE_BINARY_DIR}/${name}.zip WORKING_DIRECTORY ${EXT_INSTALL_DIR} ) # Execute find_package and send version, libraries, includes upper cmake script. @@ -121,7 +121,16 @@ else() set(CMAKE_PREFIX_PATH ${EXT_INSTALL_DIR}/${BINARY_NAME}) endif() - find_package(${name} NO_MODULE) + + if(find_extproject_COMPONENTS) + set(FIND_PROJECT_ARG ${FIND_PROJECT_ARG} COMPONENTS ${find_extproject_COMPONENTS}) + endif() + + if(find_extproject_NAMES) + set(FIND_PROJECT_ARG ${FIND_PROJECT_ARG} NAMES ${find_extproject_NAMES}) + endif() + + find_package(${name} NO_MODULE ${FIND_PROJECT_ARG}) string(TOUPPER ${name} UPPER_NAME) set(${UPPER_NAME}_FOUND ${${UPPER_NAME}_FOUND} PARENT_SCOPE) @@ -130,6 +139,7 @@ set(${UPPER_NAME}_LIBRARIES ${${UPPER_NAME}_LIBRARIES} PARENT_SCOPE) set(${UPPER_NAME}_INCLUDE_DIRS ${${UPPER_NAME}_INCLUDE_DIRS} PARENT_SCOPE) + set_target_properties(${${UPPER_NAME}_LIBRARIES} PROPERTIES IMPORTED_GLOBAL TRUE) return() endif() @@ -367,7 +377,7 @@ ) if(NOT EXISTS "${EXT_SOURCE_DIR}/.git") - color_message("Git clone ${name} ...") + color_message("Git clone ${repo_name} ...") set(error_code 1) set(number_of_tries 0) @@ -385,7 +395,7 @@ return() endif() - color_message("Configure ${name} ...") + color_message("Configure ${repo_name} ...") execute_process(COMMAND ${CMAKE_COMMAND} ${EXT_SOURCE_DIR} ${find_extproject_CMAKE_ARGS} WORKING_DIRECTORY ${EXT_BINARY_DIR}) @@ -398,7 +408,17 @@ endif() string(TOUPPER ${name} UPPER_NAME) - include(${EXT_BINARY_DIR}/${UPPER_NAME}Config.cmake) + if(EXISTS ${EXT_BINARY_DIR}/${UPPER_NAME}Config.cmake) + include(${EXT_BINARY_DIR}/${UPPER_NAME}Config.cmake) + else() + foreach(ALT_NAME ${find_extproject_NAMES}) + string(TOUPPER ${ALT_NAME} ALT_UPPER_NAME) + if(EXISTS ${EXT_BINARY_DIR}/${ALT_UPPER_NAME}Config.cmake) + include(${EXT_BINARY_DIR}/${ALT_UPPER_NAME}Config.cmake) + break() + endif() + endforeach() + endif() set(${UPPER_NAME}_FOUND ${${UPPER_NAME}_FOUND} PARENT_SCOPE) set(${UPPER_NAME}_VERSION ${${UPPER_NAME}_VERSION} PARENT_SCOPE) @@ -406,11 +426,16 @@ set(${UPPER_NAME}_LIBRARIES ${${UPPER_NAME}_LIBRARIES} PARENT_SCOPE) set(${UPPER_NAME}_INCLUDE_DIRS ${${UPPER_NAME}_INCLUDE_DIRS} PARENT_SCOPE) + set_target_properties(${${UPPER_NAME}_LIBRARIES} PROPERTIES IMPORTED_GLOBAL TRUE) + add_dependencies(${${UPPER_NAME}_LIBRARIES} ${name}_EP) # On static build we need all targets in TARGET_LINK_LIB - # Add to list imported targets with GLOBAL? - set(EXPORTS_PATHS "${EXPORTS_PATHS} ${EXT_BINARY_DIR}/${UPPER_NAME}Targets.cmake" PARENT_SCOPE) + if(ALT_UPPER_NAME) + set(EXPORTS_PATHS "${EXPORTS_PATHS} ${EXT_BINARY_DIR}/${ALT_UPPER_NAME}Targets.cmake" PARENT_SCOPE) + else() + set(EXPORTS_PATHS "${EXPORTS_PATHS} ${EXT_BINARY_DIR}/${UPPER_NAME}Targets.cmake" PARENT_SCOPE) + endif() # For static builds we need all libraries list in main project. if(EXISTS ${EXT_BINARY_DIR}/ext_options.cmake) diff -Nru opencad-0.3.3+16/cmake/JSONParser.cmake opencad-0.3.3+17/cmake/JSONParser.cmake --- opencad-0.3.3+16/cmake/JSONParser.cmake 2018-02-19 21:25:37.000000000 +0000 +++ opencad-0.3.3+17/cmake/JSONParser.cmake 2018-04-07 23:56:05.000000000 +0000 @@ -27,7 +27,7 @@ if(POLICY CMP0054) # http://www.cmake.org/cmake/help/v3.1/policy/CMP0054.html # See the discussion https://github.com/CGAL/cgal/issues/189 - cmake_policy(SET CMP0054 OLD) + cmake_policy(SET CMP0054 NEW) endif() if (DEFINED JSonParserGuard) diff -Nru opencad-0.3.3+16/debian/changelog opencad-0.3.3+17/debian/changelog --- opencad-0.3.3+16/debian/changelog 2018-03-07 01:03:02.000000000 +0000 +++ opencad-0.3.3+17/debian/changelog 2018-04-08 00:00:02.000000000 +0000 @@ -1,8 +1,14 @@ -opencad (0.3.3+16-0artful1) artful; urgency=medium +opencad (0.3.3+17-0artful1) artful; urgency=medium + + * 43bde25 - Dmitry Baryshnikov : Update borsch scripts + + -- Dmitry Baryshnikov Sun, 08 Apr 2018 00:00:02 +0000 + +opencad (0.3.3+16-0unstable1) unstable; urgency=medium * 2de28d9 - Dmitry Baryshnikov : Fix bosch v2 scripts - -- Dmitry Baryshnikov Wed, 07 Mar 2018 01:03:02 +0000 + -- Dmitry Baryshnikov Wed, 07 Mar 2018 01:03:30 +0000 opencad (0.3.3+15-0unstable1) unstable; urgency=medium