Merge pull request #91 from DavidLudwig/sample_reorg_1

reduce redundancy in sample-app names

Author: DavidLudwig

.gitmodules

@@ -1,12 +1,12 @@
-[submodule "P0267_RefImpl/Samples/SVG/external/svgpp"]
-	path = P0267_RefImpl/Samples/SVG/external/svgpp
+[submodule "P0267_RefImpl/Samples/svg/external/svgpp"]
+	path = P0267_RefImpl/Samples/svg/external/svgpp
 	url = https://github.com/svgpp/svgpp
-[submodule "P0267_RefImpl/Samples/SVG/external/rapidxml_ns"]
-	path = P0267_RefImpl/Samples/SVG/external/rapidxml_ns
+[submodule "P0267_RefImpl/Samples/svg/external/rapidxml_ns"]
+	path = P0267_RefImpl/Samples/svg/external/rapidxml_ns
 	url = https://github.com/svgpp/rapidxml_ns
 [submodule "P0267_RefImpl/Tests/Catch2"]
 	path = P0267_RefImpl/Tests/Catch2
 	url = https://github.com/catchorg/Catch2
-[submodule "P0267_RefImpl/Samples/Maps/external/pugixml"]
-	path = P0267_RefImpl/Samples/Maps/external/pugixml
+[submodule "P0267_RefImpl/Samples/maps/external/pugixml"]
+	path = P0267_RefImpl/Samples/maps/external/pugixml
 	url = https://github.com/zeux/pugixml

P0267_RefImpl/Samples/CMakeLists.txt

@@ -1,10 +1,14 @@
 cmake_minimum_required(VERSION 3.0.0)
 project(io2d CXX)
 
-add_subdirectory(DrawCPP)
-add_subdirectory(RocksInSpace)
-add_subdirectory(SVG)
-add_subdirectory(Life)
-add_subdirectory(CPULoad)
-add_subdirectory(Sprites)
-add_subdirectory(Maps)
+# Search for and add sample app(s):
+file(GLOB all_paths ${CMAKE_CURRENT_LIST_DIR}/*)
+set(all_samples "")
+foreach(one_path ${all_paths})
+    if(IS_DIRECTORY ${one_path})
+        if(EXISTS ${one_path}/CMakeLists.txt)
+            get_filename_component(one_sample ${one_path} NAME)
+            add_subdirectory(${one_sample})
+        endif()
+    endif()
+endforeach()

P0267_RefImpl/Samples/CPULoad/CMakeLists.txt

@@ -0,0 +1,38 @@
+cmake_minimum_required(VERSION 3.0.0)
+set(CMAKE_CXX_STANDARD 17)
+
+# Use the CMakeLists.txt's parent-directory-name for the project's id/name
+get_filename_component(PROJECT_ID ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+string(REPLACE " " "_" PROJECT_ID ${PROJECT_ID})
+project(${PROJECT_ID})
+
+set(CPULOAD_SRC
+    main.cpp
+    data_source.cpp
+    data_source.h
+    profiler.h
+)
+
+if( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
+    list(APPEND CPULOAD_SRC profiler_mach.cpp)
+elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
+    list(APPEND CPULOAD_SRC profiler_nt.cpp)
+elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
+    list(APPEND CPULOAD_SRC profiler_linux.cpp)
+else()
+    message( "CPULoad doesn't have a profiler for this platform, thus skipping." )
+    return()
+endif()
+
+add_executable(${PROJECT_ID} ${CPULOAD_SRC})
+target_link_libraries(${PROJECT_ID} io2d)
+
+if( DEFINED IOS_PLATFORM )
+    # iOS requires special packaging, so we have to treat this target separately
+    set_target_properties(${PROJECT_ID} PROPERTIES MACOSX_BUNDLE YES)
+    set_target_properties(${PROJECT_ID} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/iOS/Info.plist")
+    target_sources(${PROJECT_ID} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/iOS/LaunchScreen.storyboard)
+    target_sources(${PROJECT_ID} PRIVATE iOS/libcxx_tmp_stubs.cpp)
+    set_target_properties(${PROJECT_ID} PROPERTIES RESOURCE "${CMAKE_CURRENT_SOURCE_DIR}/iOS/LaunchScreen.storyboard")
+    set_target_properties(${PROJECT_ID} PROPERTIES XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2")
+endif()