@@ -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)
@@ -108,11 +119,6 @@ endif()
108119source_group (src FILES ${MAIN_SOURCES} )
109120source_group (src\\ImGuiImpl FILES ${IMGUIIMPL_SOURCES} )
110121
111- if (APPLE )
112- ##set(ICON icon.icns)
113- ##set_source_files_properties(icon.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
114- endif ()
115-
116122include_directories (
117123 ${GLM_INCLUDE_DIR}
118124 ${PLOG_INCLUDE_DIR}
@@ -154,7 +160,7 @@ set(SOURCES
154160if (${CMAKE_SYSTEM_NAME} STREQUAL "Android" )
155161 add_library (${PROJECT} SHARED ${SOURCES} )
156162else ()
157- add_executable (${PROJECT} MACOSX_BUNDLE ${SOURCES} )
163+ add_executable (${PROJECT} ${SOURCES} )
158164endif ()
159165
160166if (LINUX)
@@ -174,25 +180,7 @@ if(UNIX)
174180 target_compile_options (${PROJECT} PUBLIC -Wno-unknown-pragmas)
175181endif ()
176182
177- if (APPLE )
178- set_target_properties (${PROJECT}
179- PROPERTIES
180- OUTPUT_NAME "${PROJECT} _Macos"
181- MACOSX_BUNDLE_EXECUTABLE_NAME "${PROJECT} "
182- MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT} "
183- FOLDER "${PROJECT} "
184- ##RESOURCE icon.icns
185- MACOSX_BUNDLE_SHORT_VERSION_STRING ""
186- MACOSX_BUNDLE_LONG_VERSION_STRING ""
187- ##MACOSX_BUNDLE_ICON_FILE icon.icns
188- 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" )
192-
193- elseif (UNIX )
194- set_target_properties (${PROJECT} PROPERTIES OUTPUT_NAME "${PROJECT} _Unix" )
195- endif ()
183+ set_target_properties (${PROJECT} PROPERTIES OUTPUT_NAME "${PROJECT} _${CMAKE_SYSTEM_NAME} _${FILESYSTEM_TYPE} _FS" )
196184
197185if (USE_STD_FILESYSTEM)
198186 set (CMAKE_CXX_STANDARD 17)
0 commit comments