From 7634e83917df5e26d8be57282dc6c7d288effbab Mon Sep 17 00:00:00 2001
From: Olivier Langella <olivier.langella@u-psud.fr>
Date: Thu, 30 Apr 2020 18:02:10 +0200
Subject: [PATCH] clean find pappso cmake script

---
 CMakeStuff/modules/FindPappsomspp.cmake | 138 +++++++++++++-----------
 1 file changed, 75 insertions(+), 63 deletions(-)

diff --git a/CMakeStuff/modules/FindPappsomspp.cmake b/CMakeStuff/modules/FindPappsomspp.cmake
index f40f5376..aabc0a84 100644
--- a/CMakeStuff/modules/FindPappsomspp.cmake
+++ b/CMakeStuff/modules/FindPappsomspp.cmake
@@ -1,65 +1,77 @@
 # Copyright : Olivier Langella (CNRS)
 # License : GPL-3.0+
-# Authors : Olivier Langella
-
-FIND_PATH( PAPPSOMSPP_INCLUDE_DIR pappsomspp/types.h
-               PATHS /usr/local/include /usr/include
-               PATH_SUFFIXES pappsomspp libpappsomspp ENV PATH)
-
-
-FIND_LIBRARY(PAPPSOMSPP_QT5_LIBRARY NAMES pappsomspp)
-IF (PAPPSOMSPP_INCLUDE_DIR AND PAPPSOMSPP_QT5_LIBRARY)
-  mark_as_advanced(PAPPSOMSPP_INCLUDE_DIR)
-  mark_as_advanced(PAPPSOMSPP_QT5_LIBRARY)
-  MESSAGE(STATUS "XXXXXXXXXXXXX ${PAPPSOMSPP_QT5_LIBRARY} XXXXXXXXXXXXXXX")
-  SET(PAPPSOMSPP_QT5_FOUND TRUE)
-ENDIF (PAPPSOMSPP_INCLUDE_DIR AND PAPPSOMSPP_QT5_LIBRARY)
-
-IF (PAPPSOMSPP_QT5_FOUND)
-  # show which CppUnit was found only if not quiet
-  IF (NOT PAPPSOMSPP_FIND_QUIETLY)
-    MESSAGE(STATUS "Found PAPPSOMSPP_QT5_LIBRARY for Qt5: ${PAPPSOMSPP_QT5_LIBRARY}")
-  ENDIF (NOT PAPPSOMSPP_FIND_QUIETLY)
-  
-  
-  if(NOT TARGET Pappso::Core)
-        add_library(Pappso::Core UNKNOWN IMPORTED)
-        set_target_properties(Pappso::Core PROPERTIES
-            IMPORTED_LOCATION             "${PAPPSOMSPP_QT5_LIBRARY}"
-            INTERFACE_INCLUDE_DIRECTORIES "${PAPPSOMSPP_INCLUDE_DIR}")
-  endif()
-
-  
-
-    FIND_LIBRARY(PAPPSOMSPP_WIDGET_QT5_LIBRARY NAMES pappsomspp-widget)
-    IF (PAPPSOMSPP_INCLUDE_DIR AND PAPPSOMSPP_WIDGET_QT5_LIBRARY)
-        MESSAGE(STATUS "XXXXXXXXXXXXX ${PAPPSOMSPP_WIDGET_QT5_LIBRARY} XXXXXXXXXXXXXXX")
-        SET(PAPPSOMSPP_WIDGET_QT5_FOUND TRUE)
-      mark_as_advanced(PAPPSOMSPP_WIDGET_QT5_LIBRARY)  
-        
-      if(NOT TARGET Pappso::Widget)
-        add_library(Pappso::Widget UNKNOWN IMPORTED)
-        set_target_properties(Pappso::Widget PROPERTIES
-            IMPORTED_LOCATION             "${PAPPSOMSPP_WIDGET_QT5_LIBRARY}"
-            INTERFACE_INCLUDE_DIRECTORIES "${PAPPSOMSPP_INCLUDE_DIR}")
-      endif()
-    ENDIF (PAPPSOMSPP_INCLUDE_DIR AND PAPPSOMSPP_WIDGET_QT5_LIBRARY)
-  
-ENDIF (PAPPSOMSPP_QT5_FOUND)
-
-
-IF (PAPPSOMSPP_QT5_FOUND)
-  # show which CppUnit was found only if not quiet
-  IF (NOT PAPPSOMSPP_FIND_QUIETLY)
-    MESSAGE(STATUS "Found PAPPSOMSPP_WIDGET_QT5_LIBRARY for Qt5: ${PAPPSOMSPP_WIDGET_QT5_LIBRARY}")
-  ENDIF (NOT PAPPSOMSPP_FIND_QUIETLY)
-  
-  
-ENDIF (PAPPSOMSPP_QT5_FOUND)
-
-  IF (NOT PAPPSOMSPP_QT5_FOUND)
-    # fatal error if CppUnit is required but not found
-    IF (PAPPSOMSPP_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find PAPPSOMSPP Qt5 please do specify the PAPPSOMSPP_INCLUDE_DIR and  PAPPSOMSP_QT5_LIBRARY variables using ccmake!")
-    ENDIF (PAPPSOMSPP_FIND_REQUIRED)
-  ENDIF (NOT PAPPSOMSPP_QT5_FOUND)
+# Authors : Olivier Langella, Filippo Rusconi
+
+find_path(PappsoMSpp_INCLUDE_DIR pappsomspp/types.h
+	PATHS /usr/local/include /usr/include
+	PATH_SUFFIXES pappsomspp libpappsomspp ENV PATH)
+
+
+find_library(PappsoMSpp_LIBRARY NAMES pappsomspp)
+
+if(PappsoMSpp_INCLUDE_DIR AND PappsoMSpp_LIBRARY)
+
+	mark_as_advanced(PappsoMSpp_INCLUDE_DIR)
+	mark_as_advanced(PappsoMSpp_LIBRARY)
+
+	message(STATUS "~~~~~~~~~~~~~ ${PappsoMSpp_LIBRARY} ~~~~~~~~~~~~~~~")
+
+	set(PappsoMSpp_FOUND TRUE)
+
+endif()
+
+if(PappsoMSpp_FOUND)
+	# show which CppUnit was found only if not quiet
+
+	if(NOT PappsoMSpp_FIND_QUIETLY)
+		message(STATUS "Found PappsoMSpp_LIBRARY: ${PappsoMSpp_LIBRARY}")
+	endif()
+
+	if(NOT TARGET PappsoMSpp::Core)
+
+		add_library(PappsoMSpp::Core UNKNOWN IMPORTED)
+
+		set_target_properties(PappsoMSpp::Core PROPERTIES
+			IMPORTED_LOCATION             "${PappsoMSpp_LIBRARY}"
+			INTERFACE_INCLUDE_DIRECTORIES "${PappsoMSpp_INCLUDE_DIR}")
+
+	endif()
+
+	find_library(PappsoMSpp_WIDGET_LIBRARY NAMES pappsomspp-widget)
+
+	if(PappsoMSpp_INCLUDE_DIR AND PappsoMSpp_WIDGET_LIBRARY)
+
+		mark_as_advanced(PappsoMSpp_WIDGET_LIBRARY)  
+
+		message(STATUS "~~~~~~~~~~~~~ ${PappsoMSpp_WIDGET_LIBRARY} ~~~~~~~~~~~~~~~")
+
+		set(PappsoMSpp_WIDGET_FOUND TRUE)
+
+		if(NOT TARGET PappsoMSpp::Widget)
+
+			add_library(PappsoMSpp::Widget UNKNOWN IMPORTED)
+
+			set_target_properties(PappsoMSpp::Widget PROPERTIES
+				IMPORTED_LOCATION             "${PappsoMSpp_WIDGET_LIBRARY}"
+				INTERFACE_INCLUDE_DIRECTORIES "${PappsoMSpp_INCLUDE_DIR}")
+
+		endif()
+
+	endif()
+
+	# show which CppUnit was found only if not quiet
+	if(NOT PappsoMSpp_FIND_QUIETLY)
+		message(STATUS "Found PappsoMSpp_WIDGET_LIBRARY: ${PappsoMSpp_WIDGET_LIBRARY}")
+	endif()
+
+else()
+
+	# fatal error if CppUnit is required but not found
+	if(PappsoMSpp_FIND_REQUIRED)
+
+		message(FATAL_ERROR "Could not find libpappsomspp. Please do specify the
+		PappsoMSpp_INCLUDE_DIR and PappsoMSpp_LIBRARY variables using cmake!")
+
+	endif()
+
+endif()
-- 
GitLab