@@ -36,10 +36,11 @@ if (UNIX)
3636endif ()
3737
3838if (USE_CXX_STANDARD_20)
39+ # we can keep the old const char* everywhere
3940 if (MSVC )
40- add_compile_options (/Zc:char8_t-) # we can keep the old const char* everywhere
41+ add_compile_options (/Zc:char8_t-)
4142 else ()
42- add_compile_options (-fno-char8_t) # we can keep the old const char* everywhere
43+ add_compile_options (-fno-char8_t)
4344 endif ()
4445endif ()
4546
@@ -51,6 +52,16 @@ endif()
5152
5253set (ORIGINAL_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} )
5354
55+ set (FILESYSTEM_TYPE)
56+ if (USE_STD_FILESYSTEM)
57+ set (FILESYSTEM_TYPE "STD" )
58+ elseif (USE_BOOST_FILESYSTEM)
59+ set (FILESYSTEM_TYPE "BOOST" )
60+ else ()
61+ set (USE_DIRENT_FILESYSTEM ON CACHE BOOL "" FORCE)
62+ set (FILESYSTEM_TYPE "DIRENT" )
63+ endif ()
64+
5465if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" )
5566 add_definitions (-DMSVC)
5667 if (USE_CXX_STANDARD_20)
@@ -177,7 +188,6 @@ endif()
177188if (APPLE )
178189 set_target_properties (${PROJECT}
179190 PROPERTIES
180- OUTPUT_NAME "${PROJECT} _Macos"
181191 MACOSX_BUNDLE_EXECUTABLE_NAME "${PROJECT} "
182192 MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT} "
183193 FOLDER "${PROJECT} "
@@ -186,12 +196,12 @@ if (APPLE)
186196 MACOSX_BUNDLE_LONG_VERSION_STRING ""
187197 ##MACOSX_BUNDLE_ICON_FILE icon.icns
188198 MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR} /MacOSXBundleInfo.plist.in" )
189- elseif (WIN32 )
190- set_target_properties (${PROJECT} PROPERTIES OUTPUT_NAME "${PROJECT} _Win32" )
191- elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Android" )
199+ endif ()
192200
193- elseif (UNIX )
194- set_target_properties (${PROJECT} PROPERTIES OUTPUT_NAME "${PROJECT} _Unix" )
201+ if (${CMAKE_SYSTEM_NAME} STREQUAL "Android" )
202+ ## no name, maybe the apk in a other way
203+ else ()
204+ set_target_properties (${PROJECT} PROPERTIES OUTPUT_NAME "${PROJECT} _${CMAKE_SYSTEM_NAME} _${FILESYSTEM_TYPE} _FS" )
195205endif ()
196206
197207if (USE_STD_FILESYSTEM)
0 commit comments