From 0030588c37873497daec0672f711827dab53969b Mon Sep 17 00:00:00 2001
From: Jonathan Youett <youett@math.fu-berlin.de>
Date: Fri, 19 Dec 2014 12:39:01 +0100
Subject: [PATCH] Only set ENABLE_IPOPT when add_dune_ipopt_flags is set.
---
cmake/modules/FindIPOpt.cmake | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/cmake/modules/FindIPOpt.cmake b/cmake/modules/FindIPOpt.cmake
index a9704cf6..f7686629 100644
--- a/cmake/modules/FindIPOpt.cmake
+++ b/cmake/modules/FindIPOpt.cmake
@@ -29,9 +29,8 @@ find_package_handle_standard_args(Ipopt DEFAULT_MSG IPOPT_INCLUDE_DIR IPOPT_LIBR
set(HAVE_IPOPT ENABLE_IPOPT)
if(IPOPT_FOUND)
- set(DUNE_IPOPT_CFLAGS -I${IPOPT_INCLUDE_DIR})
- set_property(GLOBAL APPEND PROPERTY ALL_PKG_FLAGS "-DENABLE_IPOPT")
- set_property(GLOBAL APPEND PROPERTY ALL_PKG_FLAGS ${DUNE_IPOPT_CFLAGS})
+ set(DUNE_IPOPT_CFLAGS "-I${IPOPT_INCLUDE_DIR} -DENABLE_IPOPT=1")
+ set_property(GLOBAL APPEND PROPERTY ALL_PKG_FLAGS "-I${IPOPT_INCLUDE_DIR}")
set(IPOPT_LIBRARY ${IPOPT_LIBRARY})
if (HSL_FOUND)
set (IPOPT_LIBRARY ${HSL_LIBRARY} ${IPOPT_LIBRARY})
--
GitLab