diff options
| author | Alexander Saprykin <xelfium@gmail.com> | 2018-05-26 13:27:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-26 13:27:14 +0200 |
| commit | 4ce5f064282c3a8d8d710aa82af7aa346b0c6dd5 (patch) | |
| tree | d95c9490352eb73f078d34a33bc4bb44ac9fa48b /ports/armadillo/disable-wrapper.patch | |
| parent | fb689bd13dd6ba563a885d71fff1dd2b32a615db (diff) | |
| parent | 2ac7527b40b1dbeb7856b9f763362c1e139e2ca9 (diff) | |
| download | vcpkg-4ce5f064282c3a8d8d710aa82af7aa346b0c6dd5.tar.gz vcpkg-4ce5f064282c3a8d8d710aa82af7aa346b0c6dd5.zip | |
Merge pull request #1 from Microsoft/master
Update vcpkg from upstream
Diffstat (limited to 'ports/armadillo/disable-wrapper.patch')
| -rw-r--r-- | ports/armadillo/disable-wrapper.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/ports/armadillo/disable-wrapper.patch b/ports/armadillo/disable-wrapper.patch new file mode 100644 index 000000000..06eb4a776 --- /dev/null +++ b/ports/armadillo/disable-wrapper.patch @@ -0,0 +1,50 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7924a8f..853c2ee 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,7 +27,7 @@ include(CheckLibraryExists)
+ ## You will then need to link your programs with -lblas -llapack instead of -larmadillo
+ ## If you're using OpenBLAS, link your programs with -lopenblas -llapack instead of -larmadillo
+
+-set(ARMA_USE_WRAPPER true)
++set(ARMA_USE_WRAPPER false)
+
+
+ # the settings below will be automatically configured by the rest of this script
+@@ -379,7 +379,7 @@ message(STATUS "Generating ${PROJECT_BINARY_DIR}/tmp/include/config.hpp")
+ configure_file(${PROJECT_BINARY_DIR}/tmp/include/armadillo_bits/config.hpp.cmake ${PROJECT_BINARY_DIR}/tmp/include/armadillo_bits/config.hpp)
+
+ message(STATUS "Generating ${PROJECT_SOURCE_DIR}/examples/Makefile")
+-configure_file(${PROJECT_SOURCE_DIR}/examples/Makefile.cmake ${PROJECT_SOURCE_DIR}/examples/Makefile)
++#configure_file(${PROJECT_SOURCE_DIR}/examples/Makefile.cmake ${PROJECT_SOURCE_DIR}/examples/Makefile)
+
+
+ include_directories(${PROJECT_BINARY_DIR}/tmp/include/ ${CMAKE_REQUIRED_INCLUDES})
+@@ -439,11 +439,13 @@ PATTERN "*~" EXCLUDE
+ PATTERN "*orig" EXCLUDE
+ )
+
++if(ARMA_USE_WRAPPER)
+ install(TARGETS armadillo EXPORT ArmadilloLibraryDepends
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+-
++endif()
++
+ # Export the package for use from the build-tree
+ # (this registers the build-tree with a global CMake-registry)
+ export(PACKAGE armadillo)
+@@ -465,10 +467,11 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake_aux/InstallFiles/ArmadilloConfigVersi
+ "${PROJECT_BINARY_DIR}/ArmadilloConfigVersion.cmake" @ONLY)
+
+ # Install the export set for use with the install-tree
++if(ARMA_USE_WRAPPER)
+ install(EXPORT ArmadilloLibraryDepends DESTINATION
+ "${CMAKE_INSTALL_DATADIR}/Armadillo/CMake"
+ COMPONENT dev)
+-
++endif()
+
+ ## GLOBAL INSTALL FILES
+ # Create ArmadilloConfig.cmake file for the use from the install tree
|