Skip to content

Commit 35ecd6d

Browse files
jlblancocjlblancoc
committed
Merge branch 'develop'
2 parents 1450014 + c110e1b commit 35ecd6d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+160
-155
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ mark_as_advanced(CMAKE_TIMING_VERBOSE)
6161
if(CMAKE_TIMING_VERBOSE AND UNIX)
6262
set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
6363
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CMAKE_CURRENT_SOURCE_DIR}/cmakemodules/custom_output.sh")
64-
endif(CMAKE_TIMING_VERBOSE AND UNIX)
64+
endif()
6565

6666
# Detect wordsize:
6767
if(CMAKE_SIZEOF_VOID_P EQUAL 8) # Size in bytes!

‎apps/robot-map-gui/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,4 @@ if(CMAKE_MRPT_HAS_Qt5 AND CMAKE_MRPT_HAS_OPENGL_GLUT)
100100
DeclareAppForInstall(${PROJECT_NAME})
101101
AppStartMenuLink(${PROJECT_NAME} "Robot-made maps viewer") # Add link to the Start menu (in Windows Installable packages)
102102

103-
endif(CMAKE_MRPT_HAS_Qt5 AND CMAKE_MRPT_HAS_OPENGL_GLUT)
103+
endif()

‎cmakemodules/AssureCMakeRootFile.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88

99
if(NOT MRPT_SOURCE_DIR)
1010
message(FATAL_ERROR "ERROR: Do not use this directory as 'source directory' in CMake, but the ROOT directory of the MRPT source tree.")
11-
endif(NOT MRPT_SOURCE_DIR)
11+
endif()
1212

1313

‎cmakemodules/DebugMacros.cmake‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,32 @@ macro( DEBUG_INCLUDE_DIRECTORIES _TAG )
88
foreach(dir ${debug_dirs})
99
message("${dir}")
1010
endforeach()
11-
endif($ENV{DEBUG_VERBOSE})
12-
endmacro(DEBUG_INCLUDE_DIRECTORIES)
11+
endif()
12+
endmacro()
1313

14-
macro( DEBUG_VAR )
14+
macro(DEBUG_VAR)
1515
if($ENV{DEBUG_VERBOSE})
1616
message(" ")
1717
foreach(var ${ARGN})
1818
message("[DEBUG:VAR:${var}] ${${var}}")
1919
endforeach(var)
20-
endif($ENV{DEBUG_VERBOSE})
21-
endmacro(DEBUG_VAR)
20+
endif()
21+
endmacro()
2222

23-
macro( DEBUG_GLOBAL_VAR )
23+
macro(DEBUG_GLOBAL_VAR)
2424
if($ENV{DEBUG_VERBOSE})
2525
message(" ")
2626
foreach(var ${ARGN})
2727
get_property(temp GLOBAL PROPERTY ${var} )
2828
message("[DEBUG:GLOBAL_VAR:${var}] ${temp}")
2929
endforeach(var)
30-
endif($ENV{DEBUG_VERBOSE})
31-
endmacro(DEBUG_GLOBAL_VAR)
30+
endif()
31+
endmacro()
3232

33-
macro( DEBUG_MESSAGE _msg )
33+
macro(DEBUG_MESSAGE _msg)
3434
message(" ")
3535
if($ENV{DEBUG_VERBOSE})
3636
message("[DEBUG:MSG] ${_msg}")
37-
endif($ENV{DEBUG_VERBOSE})
38-
endmacro(DEBUG_MESSAGE)
37+
endif()
38+
endmacro()
3939

‎cmakemodules/DeclareMEXLib.cmake‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#-----------------------------------------------------------------------
33
macro(define_mex_lib name)
44
internal_define_mex_lib(${name} 0 ) # is_private = 0
5-
endmacro(define_mex_lib)
5+
endmacro()
66

77
# define_mex_lib_private(): Declares a private MEX library, which is stored in /private subfolder
88
# private libraries are typically used for MEX classes (MEX libraries containing several methods
@@ -11,7 +11,7 @@ endmacro(define_mex_lib)
1111
#-----------------------------------------------------------------------
1212
macro(define_mex_lib_private name)
1313
internal_define_mex_lib(${name} 1 ) # is_private = 1
14-
endmacro(define_mex_lib_private)
14+
endmacro()
1515

1616
# Implementation of both define_mex_lib() and define_mex_lib_private():
1717
#-----------------------------------------------------------------------------
@@ -21,22 +21,22 @@ macro(internal_define_mex_lib name is_private)
2121
if(${is_private})
2222
set(subfolder private) # Special subfolder private in Matlab (restricted access)
2323
set(underscore "_") # Suffix _ (syntax chosen for private libraries)
24-
endif(${is_private})
24+
endif()
2525

2626
# 32-bit or 64-bit mex: choose correct suffix depending on system
2727
if(WIN32)
2828
if (CMAKE_CL_64)
2929
set(MEX_SUFFIX .mexw64)
30-
else(CMAKE_CL_64)
30+
else()
3131
set(MEX_SUFFIX .mexw32)
32-
endif(CMAKE_CL_64)
33-
else(WIN32)
32+
endif()
33+
else()
3434
if (CMAKE_SIZEOF_VOID_P MATCHES "8")
3535
set(MEX_SUFFIX .mexa64)
36-
else(CMAKE_SIZEOF_VOID_P MATCHES "8")
36+
else()
3737
set(MEX_SUFFIX .mexglx)
3838
endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
39-
endif(WIN32)
39+
endif()
4040

4141
# Define MEX library target with specific options
4242
set_target_properties(${name} PROPERTIES
@@ -50,7 +50,7 @@ macro(internal_define_mex_lib name is_private)
5050
# Preprocessor #defines are done here to set proper behaviour of Matlab headers (e.g. matrix.h) during compilation
5151
add_definitions(/DMATLAB_MEX_FILE) # Equivalent to #define MATLAB_MEX_FILE
5252
add_definitions(/DMX_COMPAT_32) # Equivalent to #define MX_COMPAT_32
53-
endmacro(internal_define_mex_lib)
53+
endmacro()
5454

5555
# define_mex_test(): Declares a MEX executable which allows debug of mexFunction() through main() function:
5656
# Important: This scripts bases on previously configured MEX library,
@@ -72,4 +72,4 @@ endmacro(internal_define_mex_lib)
7272

7373
# Set MEX tests' output directory
7474
set_target_properties("${name}-test" PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${MEX_EXECUTABLE_OUTPUT_PATH})
75-
endmacro(define_mex_test name)
75+
endmacro()

‎cmakemodules/DeclareMRPTLib.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ macro(internal_define_mrpt_lib name headers_only )
445445
if (EXISTS "${PDB_FILE}")
446446
install(FILES ${PDB_FILE} DESTINATION bin COMPONENT LibrariesDebugInfoPDB)
447447
endif ()
448-
endif(MSVC)
448+
endif()
449449
else() # it IS headers_only:
450450
install(TARGETS ${name} EXPORT mrpt-${name}-targets)
451451
endif ()

‎cmakemodules/FilterFileLists.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ macro(REMOVE_MATCHING_FILES_FROM_LIST match_expr lst_files)
77
foreach(FIL ${${lst_files}})
88
if(NOT ${FIL} MATCHES "${match_expr}")
99
set(lst_files_aux "${lst_files_aux}" "${FIL}")
10-
endif(NOT ${FIL} MATCHES "${match_expr}")
10+
endif()
1111
endforeach(FIL)
1212
set(${lst_files} ${lst_files_aux})
13-
endmacro(REMOVE_MATCHING_FILES_FROM_LIST)
13+
endmacro()
1414

1515
macro(KEEP_MATCHING_FILES_FROM_LIST match_expr lst_files)
1616
set(lst_files_aux "")
1717
foreach(FIL ${${lst_files}})
1818
if(${FIL} MATCHES "${match_expr}")
1919
set(lst_files_aux "${lst_files_aux}" "${FIL}")
20-
endif(${FIL} MATCHES "${match_expr}")
20+
endif()
2121
endforeach(FIL)
2222
set(${lst_files} ${lst_files_aux})
23-
endmacro(KEEP_MATCHING_FILES_FROM_LIST)
23+
endmacro()

‎cmakemodules/FindDC1394.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ if(DC1394_INCLUDE_DIR)
3030
#The following deprecated settings are for backwards compatibility with CMake1.4
3131
set (DC1394_INCLUDE_PATH ${DC1394_INCLUDE_DIR})
3232

33-
endif(DC1394_LIBRARY)
34-
endif(DC1394_INCLUDE_DIR)
33+
endif()
34+
endif()
3535

‎cmakemodules/FindMatlab.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ find_path(MATLAB_INCLUDE_DIR mex.h
1515

1616
if(MATLAB_INCLUDE_DIR) # Protect against #include'ing undefined dirs.
1717
include_directories(${MATLAB_INCLUDE_DIR})
18-
endif(MATLAB_INCLUDE_DIR)
18+
endif()
1919

2020
find_library( MATLAB_MEX_LIBRARY
2121
NAMES libmex mex
@@ -37,7 +37,7 @@ if(MATLAB_INCLUDE_DIR AND MATLAB_LIBRARIES)
3737
set(MATLAB_FOUND 1)
3838
# get_filename_component(MATLAB_VERSION ${MATLAB_ROOT} NAME) # Find MATLAB version
3939
# set(MATLAB_VERSION ${MATLAB_VERSION} CACHE STRING "" FORCE) # Force value over GUI
40-
endif(MATLAB_INCLUDE_DIR AND MATLAB_LIBRARIES)
40+
endif()
4141

4242
mark_as_advanced(
4343
MATLAB_LIBRARIES

‎cmakemodules/FindOpenMP.cmake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ set(OpenMP_CXX_TEST_SOURCE ${OpenMP_C_TEST_SOURCE})
6363
if(DEFINED OpenMP_C_FLAGS AND DEFINED OpenMP_CXX_FLAGS)
6464
set(OpenMP_C_FLAG_CANDIDATES)
6565
set(OpenMP_CXX_FLAG_CANDIDATES)
66-
endif(DEFINED OpenMP_C_FLAGS AND DEFINED OpenMP_CXX_FLAGS)
66+
endif()
6767

6868
# check c compiler
6969
foreach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
@@ -76,7 +76,7 @@ foreach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
7676
if(OpenMP_FLAG_DETECTED)
7777
set(OpenMP_C_FLAGS_INTERNAL "${FLAG}")
7878
break()
79-
endif(OpenMP_FLAG_DETECTED)
79+
endif()
8080
endforeach(FLAG ${OpenMP_C_FLAG_CANDIDATES})
8181

8282
# check cxx compiler
@@ -90,7 +90,7 @@ foreach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES})
9090
if(OpenMP_FLAG_DETECTED)
9191
set(OpenMP_CXX_FLAGS_INTERNAL "${FLAG}")
9292
break()
93-
endif(OpenMP_FLAG_DETECTED)
93+
endif()
9494
endforeach(FLAG ${OpenMP_CXX_FLAG_CANDIDATES})
9595

9696
set(OpenMP_C_FLAGS "${OpenMP_C_FLAGS_INTERNAL}"

0 commit comments

Comments
 (0)