Merge branch 'feature-issue117' #117

* feature-issue117:
  Fixed a bug with the installer which was always failing. The installer was trying to un/register file "sa.shellextension-d.dll" even if we were building in release.

Author: end2endzone

CMakeLists.txt

@@ -156,6 +156,14 @@ if(NOT CMAKE_DEBUG_POSTFIX)
   set(CMAKE_DEBUG_POSTFIX "-d")
 endif()
 
+# Define EXEC_FILENAME_POSTFIX to accurately guess the end of filename of library/executable files
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(EXEC_FILENAME_POSTFIX "${CMAKE_DEBUG_POSTFIX}")
+else()
+  set(EXEC_FILENAME_POSTFIX "")
+endif()
+MESSAGE( STATUS "EXEC_FILENAME_POSTFIX:        " ${EXEC_FILENAME_POSTFIX} )
+
 # Prevents annoying warnings on MSVC
 if (WIN32)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS)

wix/WIX.extra.in

@@ -35,8 +35,8 @@
         <![CDATA[(&RegistrationFeature=2) AND (!RegistrationFeature=3)]]>
       </Custom>
     </InstallExecuteSequence>
-    <CustomAction Id="RegisterFeatureInstall"     Return="check" Impersonate="no" Execute="deferred" Directory="CM_DP_bin" ExeCommand="regsvr32.exe /s    &quot;[CM_DP_bin]sa.shellextension${CMAKE_DEBUG_POSTFIX}.dll&quot;"/>
-    <CustomAction Id="UnregisterFeatureUninstall" Return="check" Impersonate="no" Execute="deferred" Directory="CM_DP_bin" ExeCommand="regsvr32.exe /s /u &quot;[CM_DP_bin]sa.shellextension${CMAKE_DEBUG_POSTFIX}.dll&quot;"/>
+    <CustomAction Id="RegisterFeatureInstall"     Return="check" Impersonate="no" Execute="deferred" Directory="CM_DP_bin" ExeCommand="regsvr32.exe /s    &quot;[CM_DP_bin]sa.shellextension${EXEC_FILENAME_POSTFIX}.dll&quot;"/>
+    <CustomAction Id="UnregisterFeatureUninstall" Return="check" Impersonate="no" Execute="deferred" Directory="CM_DP_bin" ExeCommand="regsvr32.exe /s /u &quot;[CM_DP_bin]sa.shellextension${EXEC_FILENAME_POSTFIX}.dll&quot;"/>
 
     <DirectoryRef Id="INSTALL_ROOT">
       <Component Id="cmpREGISTRATION" Guid="*">