fix cmake script bug detecting libsimpleini

MRPT · Oct 21, 2020 · 3607b51 · 3607b51
1 parent 3fc2ebb
commit 3607b51
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/cmakemodules/script_show_final_summary.cmake b/cmakemodules/script_show_final_summary.cmake
@@ -4,22 +4,22 @@
 macro(SHOW_CONFIG_LINE MSG_TEXT VALUE_BOOL)
 	if(${VALUE_BOOL})
 		set(VAL_TEXT "Yes")
-	else(${VALUE_BOOL})
+	else()
 		set(VAL_TEXT " No")
-	endif(${VALUE_BOOL})
+	endif()
 	message(STATUS " ${MSG_TEXT} : ${VAL_TEXT} ${ARGV2}")
 endmacro()
 
 macro(SHOW_CONFIG_LINE_SYSTEM MSG_TEXT VALUE_BOOL)
 	if(${VALUE_BOOL})
 		if(${VALUE_BOOL}_SYSTEM)
 			set(VAL_TEXT "Yes (System)")
-		else(${VALUE_BOOL}_SYSTEM)
+		else()
 			set(VAL_TEXT "Yes (Built-in)")
-		endif(${VALUE_BOOL}_SYSTEM)
-	else(${VALUE_BOOL})
+		endif()
+	else()
 		set(VAL_TEXT " No")
-	endif(${VALUE_BOOL})
+	endif()
 	message(STATUS " ${MSG_TEXT} : ${VAL_TEXT} ${ARGV2}")
 endmacro()
 
@@ -39,17 +39,17 @@ foreach(_LIB ${ALL_MRPT_LIBS})
 	set(_LIB_TYPE   "             ")
 	if (_LIB_METALIB)
 		set(_LIB_TYPE "(meta-lib)   ")
-	elseif(_LIB_HDRONLY)
+	elseif()
 		set(_LIB_TYPE "(header-only)")
-	endif(_LIB_METALIB)
+	endif()
 
 	string(LENGTH "${_LIB}" LIBLEN)
 	while(LIBLEN LESS 20)
 		set(_LIB "${_LIB} ")
 		string(LENGTH "${_LIB}" LIBLEN)
 	endwhile()
 	message(STATUS " ${_LIB} ${_LIB_TYPE} => ${_LIB_DEP}")
-endforeach(_LIB)
+endforeach()
 else()
 	message(STATUS " Modules: ${ALL_MRPT_LIBS}")
 endif()
@@ -198,4 +198,4 @@ if (NOT CMAKE_MRPT_HAS_OPENCV AND NOT DISABLE_OPENCV)
 	message(STATUS "*  on without OpenCV, proceed to build instead. ")
 	message(STATUS "***********************************************************************")
 	message(STATUS "")
-endif(NOT CMAKE_MRPT_HAS_OPENCV AND NOT DISABLE_OPENCV)
+endif()
diff --git a/cmakemodules/script_simpleini.cmake b/cmakemodules/script_simpleini.cmake
@@ -28,7 +28,7 @@ if(LIBUCI_INCLUDE_DIR AND
 		set(CMAKE_MRPT_HAS_SIMPLEINI_SYSTEM 1)
 endif()
 
-if (NOT SIMPLEINI_FOUND)
+if (NOT CMAKE_MRPT_HAS_SIMPLEINI)
 	# Set to use embedded copy:
 	set(SIMPLEINI_INCLUDE_DIRS ${MRPT_SOURCE_DIR}/3rdparty/simpleini)