mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 10:49:01 +08:00
d289dea7d8
* [openturns] add port * v db * fix missing boost dep. * fix static stuff and others. * v db * reorder mpc and mpfr for linux * v db * add openturns:x64-osx=fail to ci baseline because vm uses old bison. * move baseline fail above comment * Add ci.baseline.txt note describing why it doesn't work. * Add usage text. * fix version * v db --------- Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 77ecf3e9e..b78ebcbec 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -287,14 +287,6 @@ if (USE_BOOST)
|
|
set (Boost_VERSION "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
|
|
endif ()
|
|
set (OPENTURNS_HAVE_BOOST TRUE)
|
|
- if (USE_MPFR)
|
|
- find_package (MPFR)
|
|
- if (MPFR_FOUND)
|
|
- set (OPENTURNS_HAVE_MPFR TRUE)
|
|
- list (APPEND OPENTURNS_PRIVATE_INCLUDE_DIRS ${MPFR_INCLUDE_DIRS})
|
|
- list (APPEND OPENTURNS_PRIVATE_LIBRARIES ${MPFR_LIBRARIES})
|
|
- endif ()
|
|
- endif ()
|
|
if (USE_MPC AND NOT Boost_VERSION VERSION_LESS 1.68)
|
|
find_package (MPC)
|
|
if (MPC_FOUND)
|
|
@@ -303,6 +295,14 @@ if (USE_BOOST)
|
|
list (APPEND OPENTURNS_PRIVATE_LIBRARIES ${MPC_LIBRARIES})
|
|
endif ()
|
|
endif ()
|
|
+ if (USE_MPFR)
|
|
+ find_package (MPFR)
|
|
+ if (MPFR_FOUND)
|
|
+ set (OPENTURNS_HAVE_MPFR TRUE)
|
|
+ list (APPEND OPENTURNS_PRIVATE_INCLUDE_DIRS ${MPFR_INCLUDE_DIRS})
|
|
+ list (APPEND OPENTURNS_PRIVATE_LIBRARIES ${MPFR_LIBRARIES})
|
|
+ endif ()
|
|
+ endif ()
|
|
if((USE_MPC OR USE_MPFR) AND NOT BUILD_SHARED_LIBS)
|
|
find_library(GMP_LIBRARY NAMES gmp)
|
|
list (APPEND OPENTURNS_PRIVATE_LIBRARIES ${GMP_LIBRARY})
|