Merge pull request #494 from traversaro/add-qwt

Add qwt port

4 files changed, 105 insertions, 2 deletions

diff --git a/scripts/cmake/vcpkg_apply_patches.cmake b/scripts/cmake/vcpkg_apply_patches.cmake
index cd3026b6a..d509e36ec 100644
--- a/scripts/cmake/vcpkg_apply_patches.cmake
+++ b/scripts/cmake/vcpkg_apply_patches.cmake
@@ -1,5 +1,26 @@
+#.rst:
+# .. command:: vcpkg_apply_patches
+#
+#  Apply a set of patches to a source tree.
+#
+#  ::
+#  vcpkg_apply_patches(SOURCE_PATH <source_path>
+#                      PATCHES patch1 [patch ...]
+#                      )
+#
+#  ``SOURCE_PATH``
+#    The source path in which apply the patches.
+#  ``PATCHES``
+#    A list of patches that are applied to the source tree  
+#  ``QUIET`` 
+#    If this option is passed, the warning message when applyng 
+#    a patch failes is not printed. This is convenient for patches
+#    that are known to fail even on a clean source tree, and for 
+#    which the standard warning message would be confusing for the user.
+#
+
 function(vcpkg_apply_patches)
-    cmake_parse_arguments(_ap "" "SOURCE_PATH" "PATCHES" ${ARGN})
+    cmake_parse_arguments(_ap "QUIET" "SOURCE_PATH" "PATCHES" ${ARGN})
 
     find_program(GIT git)
     set(PATCHNUM 0)
@@ -14,7 +35,7 @@ function(vcpkg_apply_patches)
             RESULT_VARIABLE error_code
         )
 
-        if(error_code)
+        if(error_code AND NOT ${_ap_QUIET})
             message(STATUS "Applying patch failed. This is expected if this patch was previously applied.")
         endif()
 
diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake
new file mode 100644
index 000000000..263200423
--- /dev/null
+++ b/scripts/cmake/vcpkg_build_qmake.cmake
@@ -0,0 +1,36 @@
+#.rst:
+# .. command:: vcpkg_build_qmake
+#
+#  Build a qmake-based project, previously configured using vcpkg_configure_qmake . 
+#  As the CONFIG qmake option is assumed to be "debug_and_release" (the default value on Windows, see [1]),
+#  both the debug and release libraries are build in the same build tree. 
+#
+#  ::
+#  vcpkg_build_qmake()
+#
+#
+# [1] : http://doc.qt.io/qt-5/qmake-variable-reference.html
+
+function(vcpkg_build_qmake)
+    vcpkg_find_acquire_program("JOM")
+    
+    if(NOT JOM)
+        BUILD_ERROR("vcpkg_install_qmake: impossible to find jom.")
+    endif()
+
+    # Make sure that the linker finds the libraries used 
+    set(ENV_LIB_BACKUP ENV{LIB})
+    set(ENV{LIB} "${CURRENT_INSTALLED_DIR}/lib;${CURRENT_INSTALLED_DIR}/debug/lib;$ENV{LIB}")
+    
+    message(STATUS "Package ${TARGET_TRIPLET}")
+    vcpkg_execute_required_process_repeat(
+        COUNT 2
+        COMMAND ${JOM}
+        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}
+        LOGNAME package-${TARGET_TRIPLET}
+    )
+    message(STATUS "Package ${TARGET_TRIPLET} done")
+    
+    # Restore the original value of ENV{LIB}
+    set(ENV{LIB} ENV_LIB_BACKUP)
+endfunction()
diff --git a/scripts/cmake/vcpkg_common_functions.cmake b/scripts/cmake/vcpkg_common_functions.cmake
index f1bbdb9e3..ff1fae953 100644
--- a/scripts/cmake/vcpkg_common_functions.cmake
+++ b/scripts/cmake/vcpkg_common_functions.cmake
@@ -5,7 +5,9 @@ include(vcpkg_execute_required_process_repeat)
 include(vcpkg_find_acquire_program)
 include(vcpkg_build_cmake)
 include(vcpkg_build_msbuild)
+include(vcpkg_build_qmake)
 include(vcpkg_install_cmake)
 include(vcpkg_configure_cmake)
+include(vcpkg_configure_qmake)
 include(vcpkg_apply_patches)
 include(vcpkg_copy_pdbs)
diff --git a/scripts/cmake/vcpkg_configure_qmake.cmake b/scripts/cmake/vcpkg_configure_qmake.cmake
new file mode 100644
index 000000000..f51a2f4fb
--- /dev/null
+++ b/scripts/cmake/vcpkg_configure_qmake.cmake
@@ -0,0 +1,44 @@
+#.rst:
+# .. command:: vcpkg_configure_qmake
+#
+#  Configure a qmake-based project. 
+#  It is assume that the qmake project CONFIG variable is 
+#  "debug_and_release" (the default value on Windows, see [1]).
+#  Using this option, only one Makefile for building both Release and Debug 
+#  libraries is generated, that then can be run using the vcpkg_install_qmake
+#  command. 
+#
+#  ::
+#  vcpkg_configure_qmake(SOURCE_PATH <pro_file_path>
+#                        [OPTIONS arg1 [arg2 ...]]
+#                        )
+#
+#  ``PROJECT_PATH``
+#    The path to the *.pro qmake project file.
+#  ``OPTIONS``
+#    The options passed to qmake.
+#
+# [1] : http://doc.qt.io/qt-5/qmake-variable-reference.html
+
+function(vcpkg_configure_qmake)
+    cmake_parse_arguments(_csc "" "SOURCE_PATH" "OPTIONS" ${ARGN})
+    
+    # Find qmake exectuable 
+    find_program(QMAKE_COMMAND NAMES qmake)
+    
+    if(NOT QMAKE_COMMAND)
+        BUILD_ERROR("vcpkg_configure_qmake: impossible to find qmake.")
+    endif()
+
+    # Cleanup build directories 
+    file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
+
+    message(STATUS "Configuring ${TARGET_TRIPLET}")
+    file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
+    vcpkg_execute_required_process(
+        COMMAND ${QMAKE_COMMAND} ${_csc_SOURCE_PATH} ${_csc_OPTIONS}
+        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}
+        LOGNAME config-${TARGET_TRIPLET}
+    )
+    message(STATUS "Configuring ${TARGET_TRIPLET} done")
+endfunction()
\ No newline at end of file