[SofaMacros] FIX regex invalid sequence errors

\.h\.in is a correct regex but CMake complains about it
guparan · Sep 26, 2019 · 5b3d1c4 · 5b3d1c4
1 parent 1b1c2fe
commit 5b3d1c4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/SofaKernel/SofaFramework/SofaMacros.cmake b/SofaKernel/SofaFramework/SofaMacros.cmake
@@ -567,7 +567,7 @@ macro(sofa_install_targets package_name the_targets include_install_dir)
         get_target_property(target_sources ${target} SOURCES)
         #list(FILTER ${target_sources} INCLUDE REGEX ".*\.h\.in$") # CMake >= 3.6
         foreach(filepath ${target_sources})
-            if(${filepath} MATCHES ".*\.h\.in$")
+            if(filepath AND ${filepath} MATCHES ".*.h.in$")
                 get_filename_component(filename ${filepath} NAME_WE)
 
                 set(configure_dir "${CMAKE_BINARY_DIR}/include/${include_install_dir}")
@@ -668,12 +668,12 @@ function(sofa_set_install_relocatable target install_dir)
             COMMENT "${target}: Patching cmake_install.cmake"
             COMMAND
                 if not exist \"${target_binary_dir}/cmake_install.cmakepatch\"
-                echo set ( CMAKE_INSTALL_PREFIX_BACK \"\$$\{CMAKE_INSTALL_PREFIX\}\" )
+                echo set ( CMAKE_INSTALL_PREFIX_BACK \"$$\{CMAKE_INSTALL_PREFIX\}\" )
                     > "${target_binary_dir}/cmake_install.cmakepatch"
-                && echo set ( CMAKE_INSTALL_PREFIX \"\$$\{CMAKE_INSTALL_PREFIX\}/${install_dir}/${target}\" )
+                && echo set ( CMAKE_INSTALL_PREFIX \"$$\{CMAKE_INSTALL_PREFIX\}/${install_dir}/${target}\" )
                     >> "${target_binary_dir}/cmake_install.cmakepatch"
                 && type \"${target_binary_dir_windows}\\\\cmake_install.cmake\" >> \"${target_binary_dir_windows}\\\\cmake_install.cmakepatch\"
-                && echo set ( CMAKE_INSTALL_PREFIX \"\$$\{CMAKE_INSTALL_PREFIX_BACK\}\" )
+                && echo set ( CMAKE_INSTALL_PREFIX \"$$\{CMAKE_INSTALL_PREFIX_BACK\}\" )
                     >> "${target_binary_dir}/cmake_install.cmakepatch"
                 && ${CMAKE_COMMAND} -E copy ${target_binary_dir}/cmake_install.cmakepatch ${target_binary_dir}/cmake_install.cmake
             )