diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index b33fd1fb..79eb5ae1 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -22,61 +22,38 @@ set(GETOPT "${GLFW_SOURCE_DIR}/deps/getopt.h"
 set(TINYCTHREAD "${GLFW_SOURCE_DIR}/deps/tinycthread.h"
                 "${GLFW_SOURCE_DIR}/deps/tinycthread.c")
 
-if (APPLE)
-    # Set fancy names for bundles
-    add_executable(Boing MACOSX_BUNDLE boing.c)
-    add_executable(Gears MACOSX_BUNDLE gears.c)
-    add_executable(Heightmap MACOSX_BUNDLE heightmap.c ${GLAD})
-    add_executable(Particles MACOSX_BUNDLE particles.c ${TINYCTHREAD})
-    add_executable(Simple MACOSX_BUNDLE simple.c)
-    add_executable(SplitView MACOSX_BUNDLE splitview.c)
-    add_executable(Wave MACOSX_BUNDLE wave.c)
+add_executable(boing WIN32 MACOSX_BUNDLE boing.c)
+add_executable(gears WIN32 MACOSX_BUNDLE gears.c)
+add_executable(heightmap WIN32 MACOSX_BUNDLE heightmap.c ${GLAD})
+add_executable(particles WIN32 MACOSX_BUNDLE particles.c ${TINYCTHREAD} ${GETOPT})
+add_executable(simple WIN32 MACOSX_BUNDLE simple.c)
+add_executable(splitview WIN32 MACOSX_BUNDLE splitview.c)
+add_executable(wave WIN32 MACOSX_BUNDLE wave.c)
 
-    set_target_properties(Boing PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Boing")
-    set_target_properties(Gears PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Gears")
-    set_target_properties(Heightmap PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Heightmap")
-    set_target_properties(Particles PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Particles")
-    set_target_properties(Simple PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Simple")
-    set_target_properties(SplitView PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Split View")
-    set_target_properties(Wave PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Wave")
+target_link_libraries(particles "${CMAKE_THREAD_LIBS_INIT}" "${RT_LIBRARY}")
 
-    set_target_properties(Boing Gears Heightmap Particles Simple SplitView Wave PROPERTIES
-                          FOLDER "GLFW3/Examples"
-                          MACOSX_BUNDLE_INFO_PLIST "${GLFW_SOURCE_DIR}/CMake/MacOSXBundleInfo.plist.in")
+set(WINDOWS_BINARIES boing gears heightmap particles simple splitview wave)
 
-else()
-    # Set boring names for executables
-    add_executable(boing WIN32 boing.c)
-    add_executable(gears WIN32 gears.c)
-    add_executable(heightmap WIN32 heightmap.c ${GLAD})
-    add_executable(particles WIN32 particles.c ${TINYCTHREAD} ${GETOPT})
-    add_executable(simple WIN32 simple.c)
-    add_executable(splitview WIN32 splitview.c)
-    add_executable(wave WIN32 wave.c)
-
-    set_target_properties(boing gears heightmap particles simple splitview wave PROPERTIES
-                          FOLDER "GLFW3/Examples")
-endif()
-
-if (APPLE)
-    target_link_libraries(Particles "${CMAKE_THREAD_LIBS_INIT}")
-elseif (UNIX)
-    target_link_libraries(particles "${CMAKE_THREAD_LIBS_INIT}" "${RT_LIBRARY}")
-endif()
+set_target_properties(${WINDOWS_BINARIES} PROPERTIES FOLDER "GLFW3/Examples")
 
 if (MSVC)
-    set(WINDOWS_BINARIES boing gears heightmap particles simple splitview wave)
-
     # Tell MSVC to use main instead of WinMain for Windows subsystem executables
     set_target_properties(${WINDOWS_BINARIES} PROPERTIES
                           LINK_FLAGS "/ENTRY:mainCRTStartup")
 endif()
 
 if (APPLE)
-    set(BUNDLE_BINARIES Boing Gears Heightmap Particles Simple SplitView Wave)
+    set_target_properties(boing PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Boing")
+    set_target_properties(gears PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Gears")
+    set_target_properties(heightmap PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Heightmap")
+    set_target_properties(particles PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Particles")
+    set_target_properties(simple PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Simple")
+    set_target_properties(splitview PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Split View")
+    set_target_properties(wave PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Wave")
 
-    set_target_properties(${BUNDLE_BINARIES} PROPERTIES
+    set_target_properties(${WINDOWS_BINARIES} PROPERTIES
                           MACOSX_BUNDLE_SHORT_VERSION_STRING ${GLFW_VERSION}
-                          MACOSX_BUNDLE_LONG_VERSION_STRING ${GLFW_VERSION_FULL})
+                          MACOSX_BUNDLE_LONG_VERSION_STRING ${GLFW_VERSION_FULL}
+                          MACOSX_BUNDLE_INFO_PLIST "${GLFW_SOURCE_DIR}/CMake/MacOSXBundleInfo.plist.in")
 endif()