From 704df13dd9a88e9029e21a21dc49246ad0b6c152 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 26 Mar 2020 12:03:04 +0100
Subject: [PATCH] TMSS-156: added and used FindCurlCpp.cmake for libcurlpp
---
CMake/FindCurlCpp.cmake | 47 +++++++++++++++++++
.../MainCU/src/MACScheduler/CMakeLists.txt | 3 +-
.../src/MACScheduler/test/CMakeLists.txt | 1 -
3 files changed, 49 insertions(+), 2 deletions(-)
create mode 100644 CMake/FindCurlCpp.cmake
diff --git a/CMake/FindCurlCpp.cmake b/CMake/FindCurlCpp.cmake
new file mode 100644
index 00000000000..5f19279f892
--- /dev/null
+++ b/CMake/FindCurlCpp.cmake
@@ -0,0 +1,47 @@
+# - Try to find readline, a library for easy editing of command lines.
+# Variables used by this module:
+# CURLCPP_ROOT_DIR - CurlCpp root directory
+# Variables defined by this module:
+# CURLCPP_FOUND - system has CurlCpp
+# CURLCPP_INCLUDE_DIR - the CurlCpp include directory (cached)
+# CURLCPP_INCLUDE_DIRS - the CurlCpp include directories
+# (identical to CURLCPP_INCLUDE_DIR)
+# CURLCPP_LIBRARY - the CurlCpp library (cached)
+# CURLCPP_LIBRARIES - the CurlCpp library
+
+# Copyright (C) 2009
+# ASTRON (Netherlands Institute for Radio Astronomy)
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
+#
+# This file is part of the LOFAR software suite.
+# The LOFAR software suite is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# The LOFAR software suite is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
+#
+# $Id$
+
+if(NOT CURLCPP_FOUND)
+
+ find_path(CURLCPP_INCLUDE_DIR curlpp/cURLpp.hpp
+ HINTS ${CURLCPP_ROOT_DIR} PATH_SUFFIXES include)
+ find_library(CURLCPP_LIBRARY curlpp
+ HINTS ${CURLCPP_ROOT_DIR} PATH_SUFFIXES lib)
+ mark_as_advanced(CURLCPP_INCLUDE_DIR CURLCPP_LIBRARY)
+
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(curlcpp DEFAULT_MSG
+ CURLCPP_LIBRARY CURLCPP_INCLUDE_DIR)
+
+ set(CURLCPP_INCLUDE_DIRS ${CURLCPP_INCLUDE_DIR})
+ set(CURLCPP_LIBRARIES ${CURLCPP_LIBRARY})
+
+endif(NOT CURLCPP_FOUND)
diff --git a/MAC/APL/MainCU/src/MACScheduler/CMakeLists.txt b/MAC/APL/MainCU/src/MACScheduler/CMakeLists.txt
index f8cc29c6b5c..9aa9a883fd0 100644
--- a/MAC/APL/MainCU/src/MACScheduler/CMakeLists.txt
+++ b/MAC/APL/MainCU/src/MACScheduler/CMakeLists.txt
@@ -1,6 +1,7 @@
# $Id$
lofar_find_package(JsonCpp)
+lofar_find_package(CurlCpp)
lofar_add_bin_program(MACScheduler
MACSchedulerMain.cc
@@ -20,4 +21,4 @@ install(FILES
${CMAKE_CURRENT_BINARY_DIR}/MACScheduler.conf
DESTINATION etc)
-add_subdirectory(test)
+#add_subdirectory(test)
diff --git a/MAC/APL/MainCU/src/MACScheduler/test/CMakeLists.txt b/MAC/APL/MainCU/src/MACScheduler/test/CMakeLists.txt
index 13bb1b7ed07..1995a1a0743 100644
--- a/MAC/APL/MainCU/src/MACScheduler/test/CMakeLists.txt
+++ b/MAC/APL/MainCU/src/MACScheduler/test/CMakeLists.txt
@@ -1,7 +1,6 @@
include(LofarCTest)
lofar_find_package(UnitTest++)
-find_library(JSONCPP jsoncpp)
if(UNITTEST++_FOUND)
target_link_libraries(tTMSSBridge jsoncpp)
--
GitLab