From 7a949292c8a27f5cf7b7a675cd45363aef31d11d Mon Sep 17 00:00:00 2001
From: fherrero <fherrero@iri.upc.edu>
Date: Tue, 12 May 2020 17:10:53 +0200
Subject: [PATCH] Modify Find.cmake template using library_name variable.
 Update new_project.sh accordingly.

---
 Findlib_template.cmake | 40 ++++++++++++++++++++--------------------
 new_project.sh         |  4 +---
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/Findlib_template.cmake b/Findlib_template.cmake
index 91b373b..d9ec660 100755
--- a/Findlib_template.cmake
+++ b/Findlib_template.cmake
@@ -1,24 +1,24 @@
 #edit the following line to add the librarie's header files
-FIND_PATH(library_name_INCLUDE_DIRS header_file /usr/include/iri/library_name /usr/local/include/iri/library_name)
+SET(name library_name)
+FIND_PATH(${name}_INCLUDE_DIRS ${name}.h /usr/include/iri/${name} /usr/local/include/iri/${name})
 
-FIND_LIBRARY(library_name_LIBRARIES
-    NAMES library_name
-    PATHS /usr/lib /usr/lib/iri/library_name /usr/local/lib /usr/local/lib/iri/library_name)
+FIND_LIBRARY(${name}_LIBRARIES
+    NAMES ${name}
+    PATHS /usr/lib /usr/lib/iri/${name} /usr/local/lib /usr/local/lib/iri/${name})
+    
+SET(${name}_INCLUDE_DIR ${${name}_INCLUDE_DIRS})
+SET(${name}_LIBRARY     ${${name}_LIBRARIES})
 
-SET(library_name_INCLUDE_DIR ${library_name_INCLUDE_DIRS})
-SET(library_name_LIBRARY     ${library_name_LIBRARIES})
-
-IF (library_name_INCLUDE_DIRS AND library_name_LIBRARIES)
-   SET(library_name_FOUND TRUE)
-ENDIF (library_name_INCLUDE_DIRS AND library_name_LIBRARIES)
-
-IF (library_name_FOUND)
-   IF (NOT library_name_FIND_QUIETLY)
-      MESSAGE(STATUS "Found library_name: ${library_name_LIBRARIES}")
-   ENDIF (NOT library_name_FIND_QUIETLY)
-ELSE (library_name_FOUND)
-   IF (library_name_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find library_name")
-   ENDIF (library_name_FIND_REQUIRED)
-ENDIF (library_name_FOUND)
+IF (${name}_INCLUDE_DIRS AND ${name}_LIBRARIES)
+   SET(${name}_FOUND TRUE)
+ENDIF (${name}_INCLUDE_DIRS AND ${name}_LIBRARIES)
 
+IF (${name}_FOUND)
+   IF (NOT ${name}_FIND_QUIETLY)
+      MESSAGE(STATUS "Found ${name}: ${${name}_LIBRARIES}")
+   ENDIF (NOT ${name}_FIND_QUIETLY)
+ELSE (${name}_FOUND)
+   IF (${name}_FIND_REQUIRED)
+      MESSAGE(FATAL_ERROR "Could not find ${name}")
+   ENDIF (${name}_FIND_REQUIRED)
+ENDIF (${name}_FOUND)
\ No newline at end of file
diff --git a/new_project.sh b/new_project.sh
index 23dedf5..35d76b0 100755
--- a/new_project.sh
+++ b/new_project.sh
@@ -248,9 +248,7 @@ else
   done
   mv CMakeLists.tmp ./src/examples/CMakeLists.txt
 
-  sed 's/header_file/'"${NAME}.h"'/g' <Findlib_template.cmake >tmp.cmake
-  sed 's/library_name/'$NAME'/g' <tmp.cmake >./Find$NAME.cmake
-  rm tmp.cmake
+  sed 's/library_name/'$NAME'/g' <Findlib_template.cmake >./Find$NAME.cmake
 
   LIBRARY_NAME=$(echo $NAME | tr '[:lower:]' '[:upper:]')
   Library_name=$(echo $NAME | sed 's/\([a-zA-Z]\)\([a-zA-Z0-9]*\)/\u\1\2/g')
-- 
GitLab