diff --git a/src/gtk/CMakeLists.txt b/src/gtk/CMakeLists.txt
index abaf5167..e6894467 100644
--- a/src/gtk/CMakeLists.txt
+++ b/src/gtk/CMakeLists.txt
@@ -59,19 +59,16 @@ TARGET_LINK_LIBRARIES (
 )
 
 INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/gvbam DESTINATION bin)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ui DESTINATION ${DATA_INSTALL_DIR})
 IF(NOT WIN32 AND NOT APPLE)
     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gvbam.desktop DESTINATION share/applications)
-    INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ui DESTINATION ${DATA_INSTALL_DIR})
 ENDIF(NOT WIN32 AND NOT APPLE)
 
-if(WIN32)
-    SET(GTK_EXE_NAME gvbam${CMAKE_EXECUTABLE_SUFFIX})
-else(WIN32)
 if(APPLE)
-    SET(GTK_EXE_NAME gvbam.app)
+    #Probably don't need this
+    SET(CMAKE_EXECUTABLE_SUFFIX .app)
     # this should set ROM file types correctly
-    SET_PROPERTY(TARGET gvbam APPEND PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/wxplist.in)
-else(APPLE)
-    SET(GTK_EXE_NAME gvbam${CMAKE_EXECUTABLE_SUFFIX})
+    SET_PROPERTY(TARGET wxvbam APPEND PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/wxplist.in)
 endif(APPLE)
-endif(WIN32)
+
+SET(WX_EXE_NAME gvbam${CMAKE_EXECUTABLE_SUFFIX})
diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
index 3d75ee84..64029be5 100644
--- a/src/wx/CMakeLists.txt
+++ b/src/wx/CMakeLists.txt
@@ -176,18 +176,15 @@ IF(NOT WIN32 AND NOT APPLE)
     INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.desktop DESTINATION share/applications)
 ENDIF(NOT WIN32 AND NOT APPLE)
 
-if(WIN32)
-    SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})
-else(WIN32)
 if(APPLE)
-    SET(WX_EXE_NAME wxvbam.app)
+    #Probably don't need this
+    SET(CMAKE_EXECUTABLE_SUFFIX .app)
     # this should set ROM file types correctly
     SET_PROPERTY(TARGET wxvbam APPEND PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/wxplist.in)
     #Handle the program icon
     file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/../art/wxvbam.icns DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
     SET(MACOSX_BUNDLE_ICON_FILE wxvbam.icns)
     SET_SOURCE_FILES_PROPERTIES(wxvbam.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-else(APPLE)
-    SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})
 endif(APPLE)
-endif(WIN32)
+
+SET(WX_EXE_NAME wxvbam${CMAKE_EXECUTABLE_SUFFIX})