cmake: move cmake/ to imgui_bundle_cmake/internal/

JackWBoynton · Jan 30, 2024 · 48c1d5d · 48c1d5d
1 parent dedd358
commit 48c1d5d
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -252,10 +252,10 @@ endif()
 # -----------------------------------------------------------------------------
 # the easiest way to build an app with imgui_bundle is to use
 #     imgui_bundle_add_app(my_app my_file.cpp)
-set(IMGUIBUNDLE_CMAKE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/imgui_bundle_cmake CACHE STRING "" FORCE)
-list(APPEND CMAKE_MODULE_PATH "${IMGUIBUNDLE_CMAKE_PATH}")
+set(IMGUI_BUNDLE_CMAKE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/imgui_bundle_cmake CACHE STRING "" FORCE)
+list(APPEND CMAKE_MODULE_PATH "${IMGUI_BUNDLE_CMAKE_PATH}")
 include(imgui_bundle_add_app)
-set(IMGUIBUNDLE_PATH ${CMAKE_CURRENT_SOURCE_DIR} CACHE STRING "" FORCE)
+set(IMGUI_BUNDLE_PATH ${CMAKE_CURRENT_SOURCE_DIR} CACHE STRING "" FORCE)
 
 
 # if building the python package, do some clenaup:
@@ -287,8 +287,7 @@ endif()
 
 # Main
 # ----------------------------------------------------------------------
-include(cmake/dump_cmake_variables.cmake)
-include(imgui_bundle_cmake/litgen_setup_module.cmake)
+include(imgui_bundle_cmake/internal/litgen_setup_module.cmake)
 set(CMAKE_CXX_STANDARD 17)
 
 # if build python binding, add definitions and use SDL + GLFW
@@ -344,7 +343,7 @@ endif()
 # find pybind11
 # -----------------------------------------------------------------------------
 if (IMGUI_BUNDLE_BUILD_PYTHON)
-    include(cmake/find_pybind11.cmake)
+    include(imgui_bundle_cmake/internal/find_pybind11.cmake)
     find_pybind11()  # provided by cmake/find_pybind11.cmake
 endif()
 
@@ -369,7 +368,7 @@ add_subdirectory(external)
 # Build python bindings
 # -----------------------------------------------------------------------------
 if (IMGUI_BUNDLE_BUILD_PYTHON)
-    include(cmake/add_imgui_bundle_bindings.cmake)
+    include(imgui_bundle_cmake/internal/add_imgui_bundle_bindings.cmake)
     add_imgui_bundle_bindings()
 
     if (IMGUI_BUNDLE_WITH_TEST_ENGINE)

diff --git a/bindings/imgui_bundle/demos_cpp/CMakeLists.txt b/bindings/imgui_bundle/demos_cpp/CMakeLists.txt
@@ -11,7 +11,7 @@ function(add_demo_cpp)
     #     add_demo_cpp(demo_name demo_file_1.cpp demo_file_2.cpp)
     set(args ${ARGN})
     list(GET args 0 demo_name)
-    set(demos_asset_folder ${IMGUIBUNDLE_PATH}/bindings/imgui_bundle/demos_assets)
+    set(demos_asset_folder ${IMGUI_BUNDLE_PATH}/bindings/imgui_bundle/demos_assets)
     imgui_bundle_add_app(${args} ASSETS_LOCATION ${demos_asset_folder})
     if(MSVC)
         hello_imgui_msvc_target_set_folder(${demo_name} demos_cpp)
@@ -99,7 +99,7 @@ add_this_folder_as_demos_library()
 if (EMSCRIPTEN)
     set(demos_python_folder ${demos_cpp_folder}/../demos_python)
 
-    set(imgui_demo_src_folder ${IMGUIBUNDLE_PATH}/external/imgui/imgui/)
+    set(imgui_demo_src_folder ${IMGUI_BUNDLE_PATH}/external/imgui/imgui/)
     set(imgui_demo_tmp_folder ${CMAKE_CURRENT_BINARY_DIR}/tmp/imgui_demo_code)
     file(COPY ${imgui_demo_src_folder}/imgui_demo.cpp DESTINATION ${imgui_demo_tmp_folder})
     file(COPY ${imgui_demo_src_folder}/imgui_demo.py DESTINATION ${imgui_demo_tmp_folder})

diff --git a/bindings/imgui_bundle/doc/CMakeLists.txt b/bindings/imgui_bundle/doc/CMakeLists.txt
@@ -5,13 +5,13 @@ set(input_doc_files
     ${CMAKE_CURRENT_LIST_DIR}/Readme_source_pypi.adoc
     ${CMAKE_CURRENT_LIST_DIR}/faq_source.adoc
     )
-file(GLOB output_html_files ${IMGUIBUNDLE_PATH}/docs/*.html)
+file(GLOB output_html_files ${IMGUI_BUNDLE_PATH}/docs/*.html)
 
 add_custom_command(
     OUTPUT
         ${output_html_files}
         ${CMAKE_CURRENT_LIST_DIR}/Readme.adoc
-        ${IMGUIBUNDLE_PATH}/bindings/imgui_bundle/Readme_pypi.md
+        ${IMGUI_BUNDLE_PATH}/bindings/imgui_bundle/Readme_pypi.md
     COMMAND /bin/bash ${CMAKE_CURRENT_LIST_DIR}/scripts/build_doc.sh
     DEPENDS ${input_doc_files}
 )

diff --git a/devel_docs/CMakeLists.txt b/devel_docs/CMakeLists.txt
@@ -1,6 +1,6 @@
 file(GLOB input_docpart_files ${CMAKE_CURRENT_LIST_DIR}/devdoc_parts/*.adoc)
 set(input_doc_files ${input_docpart_files} ${CMAKE_CURRENT_LIST_DIR}/index.adoc)
-file(GLOB output_html_files ${IMGUIBUNDLE_PATH}/docs/devel_docs/*.html)
+file(GLOB output_html_files ${IMGUI_BUNDLE_PATH}/docs/devel_docs/*.html)
 
 add_custom_command(
     OUTPUT ${output_html_files}

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -1,4 +1,4 @@
-include(../cmake/add_simple_library.cmake) # Tooling to build libraries and link them to imgui_bundle
+include(../imgui_bundle_cmake/internal/add_simple_library.cmake) # Tooling to build libraries and link them to imgui_bundle
 
 function(_target_force_include target include_file)
     if (MSVC)
@@ -21,7 +21,7 @@ endif()
 # Build ImGui & Hello ImGui
 ###############################################################################
 # Build imgui + hello_imgui
-include(../cmake/add_hello_imgui.cmake)
+include(../imgui_bundle_cmake/internal/add_hello_imgui.cmake)
 add_hello_imgui()
 if (IMGUI_BUNDLE_BUILD_PYTHON)
     target_compile_definitions(imgui PUBLIC IMGUI_BUNDLE_BUILD_PYTHON)
@@ -57,7 +57,7 @@ endif()
 if(NOT IMGUI_BUNDLE_DISABLE_IMPLOT)
     add_simple_external_library_with_sources(implot implot)
     target_compile_definitions(implot PRIVATE "IMPLOT_CUSTOM_NUMERIC_TYPES=(signed char)(unsigned char)(signed short)(unsigned short)(signed int)(unsigned int)(signed long)(unsigned long)(signed long long)(unsigned long long)(float)(double)(long double)")
-    _target_force_include(implot ${CMAKE_CURRENT_LIST_DIR}/../cmake/imgui_bundle_config.h)
+    _target_force_include(implot ${IMGUI_BUNDLE_CMAKE_PATH}/imgui_bundle_config.h)
     lg_disable_warning_exception_in_destructor(implot)
     target_compile_definitions(imgui_bundle INTERFACE IMGUI_BUNDLE_WITH_IMPLOT)
     set(IMGUI_BUNDLE_WITH_IMPLOT ON CACHE INTERNAL "" FORCE)

diff --git a/external/bindings_generation/autogenerate_all.py b/external/bindings_generation/autogenerate_all.py
@@ -28,7 +28,7 @@ def write_cmake_all_pybind_files():
 # autogenerated file! See autogenerate_all.py
 #
 
-set(external_dir ${IMGUIBUNDLE_PATH}/external)
+set(external_dir ${IMGUI_BUNDLE_PATH}/external)
 
 set(all_pybind_files
 _FILELIST_

diff --git a/external/bindings_generation/cpp/all_pybind_files.cmake b/external/bindings_generation/cpp/all_pybind_files.cmake
@@ -2,7 +2,7 @@
 # autogenerated file! See autogenerate_all.py
 #
 
-set(external_dir ${IMGUIBUNDLE_PATH}/external)
+set(external_dir ${IMGUI_BUNDLE_PATH}/external)
 
 set(all_pybind_files
     ${external_dir}/imgui/bindings/pybind_imgui_backends.cpp

diff --git a/cmake/imgui_bundle_config.h → imgui_bundle_cmake/imgui_bundle_config.h b/cmake/imgui_bundle_config.h → imgui_bundle_cmake/imgui_bundle_config.h
diff --git a/cmake/add_glfw_submodule.cmake → ...e_cmake/internal/add_glfw_submodule.cmake b/cmake/add_glfw_submodule.cmake → ...e_cmake/internal/add_glfw_submodule.cmake
@@ -52,11 +52,11 @@ function(_add_glfw_as_python_shared_library)
         glfw_deploy_editable
         ALL
         COMMAND
-            ${CMAKE_COMMAND} -E copy $<TARGET_FILE:glfw>  ${IMGUIBUNDLE_PATH}/bindings/imgui_bundle/$<TARGET_FILE_NAME:glfw>
+            ${CMAKE_COMMAND} -E copy $<TARGET_FILE:glfw>  ${IMGUI_BUNDLE_PATH}/bindings/imgui_bundle/$<TARGET_FILE_NAME:glfw>
         COMMAND
-            ${CMAKE_COMMAND} -E copy $<TARGET_FILE:glfw>  ${IMGUIBUNDLE_PATH}/bindings/imgui_bundle/libglfw.3.dylib
+            ${CMAKE_COMMAND} -E copy $<TARGET_FILE:glfw>  ${IMGUI_BUNDLE_PATH}/bindings/imgui_bundle/libglfw.3.dylib
         COMMAND
-            ${CMAKE_COMMAND} -E copy $<TARGET_FILE:glfw>  ${IMGUIBUNDLE_PATH}/bindings/imgui_bundle/libglfw.3.so
+            ${CMAKE_COMMAND} -E copy $<TARGET_FILE:glfw>  ${IMGUI_BUNDLE_PATH}/bindings/imgui_bundle/libglfw.3.so
         DEPENDS glfw
     )
 

diff --git a/cmake/add_hello_imgui.cmake → ...ndle_cmake/internal/add_hello_imgui.cmake b/cmake/add_hello_imgui.cmake → ...ndle_cmake/internal/add_hello_imgui.cmake
diff --git a/cmake/add_imgui.cmake → imgui_bundle_cmake/internal/add_imgui.cmake b/cmake/add_imgui.cmake → imgui_bundle_cmake/internal/add_imgui.cmake
@@ -26,7 +26,7 @@ function(add_imgui imgui_dir)
             target_sources(imgui PRIVATE ${imgui_dir}/backends/imgui_impl_opengl2.cpp ${imgui_dir}/backends/imgui_impl_opengl2.h)
         endif()
         target_include_directories(imgui PUBLIC ${imgui_dir} ${imgui_dir}/..)
-        target_compile_definitions(imgui PUBLIC IMGUI_USER_CONFIG="${_THIS_MODULE_DIR}/imgui_bundle_config.h")
+        target_compile_definitions(imgui PUBLIC IMGUI_USER_CONFIG="${IMGUI_BUNDLE_CMAKE_PATH}/imgui_bundle_config.h")
         lg_disable_warning_exception_in_destructor(imgui)
         if(PROJECT_IS_TOP_LEVEL AND NOT SKBUILD)
             install(TARGETS imgui DESTINATION ./lib/)

diff --git a/cmake/add_imgui_bundle_bindings.cmake → .../internal/add_imgui_bundle_bindings.cmake b/cmake/add_imgui_bundle_bindings.cmake → .../internal/add_imgui_bundle_bindings.cmake
@@ -11,7 +11,7 @@ endfunction()
 
 
 function(add_imgui_bundle_bindings)
-    set(bindings_main_folder ${IMGUIBUNDLE_PATH}/external/bindings_generation/cpp/)
+    set(bindings_main_folder ${IMGUI_BUNDLE_PATH}/external/bindings_generation/cpp/)
     include(${bindings_main_folder}/all_pybind_files.cmake)
 
     #########################################################################
@@ -29,7 +29,7 @@ function(add_imgui_bundle_bindings)
     pybind11_add_module(${python_native_module_name} ${python_module_sources})
     target_compile_definitions(${python_native_module_name} PRIVATE VERSION_INFO=${PROJECT_VERSION})
 
-    litgen_setup_module(${bound_library} ${python_native_module_name} ${python_wrapper_module_name} ${IMGUIBUNDLE_PATH}/bindings)
+    litgen_setup_module(${bound_library} ${python_native_module_name} ${python_wrapper_module_name} ${IMGUI_BUNDLE_PATH}/bindings)
 
     # add cvnp for immvision
     if (IMGUI_BUNDLE_WITH_IMMVISION)

diff --git a/cmake/add_simple_library.cmake → ...e_cmake/internal/add_simple_library.cmake b/cmake/add_simple_library.cmake → ...e_cmake/internal/add_simple_library.cmake
@@ -1,4 +1,4 @@
-set(IMGUIBUNDLE_EXTERNAL_PATH ${IMGUIBUNDLE_PATH}/external CACHE STRING "" FORCE)
+set(IMGUIBUNDLE_EXTERNAL_PATH ${IMGUI_BUNDLE_PATH}/external CACHE STRING "" FORCE)
 
 
 ####################################################

diff --git a/cmake/dump_cmake_variables.cmake → ...cmake/internal/dump_cmake_variables.cmake b/cmake/dump_cmake_variables.cmake → ...cmake/internal/dump_cmake_variables.cmake
diff --git a/cmake/find_pybind11.cmake → ...bundle_cmake/internal/find_pybind11.cmake b/cmake/find_pybind11.cmake → ...bundle_cmake/internal/find_pybind11.cmake
diff --git a/imgui_bundle_cmake/litgen_setup_module.cmake → ..._cmake/internal/litgen_setup_module.cmake b/imgui_bundle_cmake/litgen_setup_module.cmake → ..._cmake/internal/litgen_setup_module.cmake