diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | demos/input_method/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | demos/main/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | demos/scroll_view/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/ui/CMakeLists.txt | 9 |
5 files changed, 21 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4380fe4b..055a8302 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,6 +25,7 @@ if (MSVC) endif() set(CRU_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include) +set(CRU_ASSETS_DIR ${PROJECT_SOURCE_DIR}/assets) add_subdirectory(src) add_subdirectory(test) diff --git a/demos/input_method/CMakeLists.txt b/demos/input_method/CMakeLists.txt index 7f8be37a..3a290f3a 100644 --- a/demos/input_method/CMakeLists.txt +++ b/demos/input_method/CMakeLists.txt @@ -1,12 +1,10 @@ +add_executable(demo_input_method main.cpp) -if(NOT APPLE) - add_executable(demo_input_method main.cpp) -else() - add_executable(demo_input_method MACOSX_BUNDLE main.cpp) +if(APPLE) set_target_properties(demo_input_method PROPERTIES - BUNDLE TRUE - MACOSX_BUNDLE_GUI_IDENTIFIER life.crupest.cru.demo-input-method + MACOSX_BUNDLE TRUE MACOSX_BUNDLE_BUNDLE_NAME demo-input-method + MACOSX_BUNDLE_GUI_IDENTIFIER life.crupest.cru.demo-input-method ) endif() diff --git a/demos/main/CMakeLists.txt b/demos/main/CMakeLists.txt index 2f8ef9cb..6f995ee0 100644 --- a/demos/main/CMakeLists.txt +++ b/demos/main/CMakeLists.txt @@ -1,11 +1,10 @@ -if(NOT APPLE) - add_executable(demo_main main.cpp) -else() - add_executable(demo_main MACOSX_BUNDLE main.cpp) +add_executable(demo_main main.cpp) + +if(APPLE) set_target_properties(demo_main PROPERTIES - BUNDLE TRUE - MACOSX_BUNDLE_GUI_IDENTIFIER life.crupest.cru.demo-main + MACOSX_BUNDLE TRUE MACOSX_BUNDLE_BUNDLE_NAME demo-main + MACOSX_BUNDLE_GUI_IDENTIFIER life.crupest.cru.demo-main ) endif() diff --git a/demos/scroll_view/CMakeLists.txt b/demos/scroll_view/CMakeLists.txt index b84bcea2..2c6be535 100644 --- a/demos/scroll_view/CMakeLists.txt +++ b/demos/scroll_view/CMakeLists.txt @@ -1,9 +1,8 @@ -if(NOT APPLE) - add_executable(demo_scroll_view main.cpp) -else() - add_executable(demo_scroll_view MACOSX_BUNDLE main.cpp) +add_executable(demo_scroll_view main.cpp) + +if(APPLE) set_target_properties(demo_scroll_view PROPERTIES - BUNDLE TRUE + MACOSX_BUNDLE TRUE MACOSX_BUNDLE_GUI_IDENTIFIER life.crupest.cru.demo-scroll-view MACOSX_BUNDLE_BUNDLE_NAME demo-scroll-view ) diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index 353695a4..0c81b6c7 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CRU_UI_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/ui) - add_library(cru_ui SHARED Helper.cpp ThemeManager.cpp @@ -61,3 +59,10 @@ add_library(cru_ui SHARED ) target_compile_definitions(cru_ui PRIVATE CRU_UI_EXPORT_API) target_link_libraries(cru_ui PUBLIC cru_platform_gui cru_xml) + +file(GLOB_RECURSE CRU_UI_RES_SOURCES "${CRU_ASSETS_DIR}/cru/ui/*") +target_sources(cru_ui PUBLIC ${CRU_UI_RES_SOURCES}) +foreach (CRU_UI_RES_FILE ${CRU_UI_RES_SOURCES}) + file(RELATIVE_PATH CRU_UI_RES_PATH ${CRU_ASSETS_DIR} ${CRU_UI_RES_FILE}) + set_property(SOURCE ${CRU_UI_RES_FILE} PROPERTY MACOSX_PACKAGE_LOCATION "Resources/${CRU_UI_RES_PATH}") +endforeach(CRU_UI_RES_FILE) |