mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-22 20:07:49 +08:00
51 lines
2.0 KiB
Diff
51 lines
2.0 KiB
Diff
|
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
|