Use our own cmake module path variable to avoid conflicting with the main ones listy functional

3 years ago · 8ab9934143
17 changed files with 45 additions and 44 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -49,8 +49,9 @@ include( CMakeDependentOption )
 # Output compile_commands.json for various LSP and other users
 set( CMAKE_EXPORT_COMPILE_COMMANDS ON )

-# Path to local CMake modules.
-set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
+# Path to KiCad's CMake modules.
+set( KICAD_CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" )
+set( CMAKE_MODULE_PATH       "${KICAD_CMAKE_MODULE_PATH}" )

 # On Windows, binaries created by link option -g3 are very large (more than 1Gb for pcbnew,
 # and more than 3Gb for the full kicad suite)
@ -244,7 +245,7 @@ perform_feature_checks()


 # Setup the compiler warnings
-include( ${CMAKE_MODULE_PATH}/Warnings.cmake )
+include( ${KICAD_CMAKE_MODULE_PATH}/Warnings.cmake )

 if( KICAD_WIN32_CONTEXT_WINFIBER )
    set(LIBCONTEXT_USE_WINFIBER true)
@ -997,7 +998,7 @@ endif()
 # "make uninstall" rules
 #================================================
 configure_file(
-    "${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"
+    "${KICAD_CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"
    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
    IMMEDIATE @ONLY )

--- a/cmake/BuildSteps/CreateDocsetDoxyfile.cmake
+++ b/cmake/BuildSteps/CreateDocsetDoxyfile.cmake
@ -22,7 +22,7 @@

 function(get_kicad_doc_version RESULT_NAME)

-    include( ${CMAKE_MODULE_PATH}/CreateGitVersionHeader.cmake )
+    include( ${KICAD_CMAKE_MODULE_PATH}/CreateGitVersionHeader.cmake )
    create_git_version_header(${CMAKE_SOURCE_DIR})

    # Now we have KICAD_VERSION, but it's got () around it
--- a/cmake/BuildSteps/WritePlatformMetadata_linux.cmake
+++ b/cmake/BuildSteps/WritePlatformMetadata_linux.cmake
@ -32,8 +32,8 @@
 message( STATUS "Creating linux metadata" )

 # Create the KiCad version strings
-include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
-include( ${CMAKE_MODULE_PATH}/KiCadFullVersion.cmake )
+include( ${KICAD_CMAKE_MODULE_PATH}/KiCadVersion.cmake )
+include( ${KICAD_CMAKE_MODULE_PATH}/KiCadFullVersion.cmake )

 # Create the date of the configure
 string( TIMESTAMP KICAD_CONFIG_TIMESTAMP "%Y-%m-%d" )
--- a/cmake/BuildSteps/WriteVersionHeader.cmake
+++ b/cmake/BuildSteps/WriteVersionHeader.cmake
@ -23,8 +23,8 @@
 #

 # Create the KiCad version strings
-include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
-include( ${CMAKE_MODULE_PATH}/KiCadFullVersion.cmake )
+include( ${KICAD_CMAKE_MODULE_PATH}/KiCadVersion.cmake )
+include( ${KICAD_CMAKE_MODULE_PATH}/KiCadFullVersion.cmake )

 # Extract the major and minor build version as a string
 string( REGEX MATCH
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@ -40,13 +40,13 @@ function( make_lexer outputTarget inputFile outHeaderFile outCppFile enum )
            -DinputFile=${CMAKE_CURRENT_SOURCE_DIR}/${inputFile}
            -DoutHeaderFile=${CMAKE_CURRENT_BINARY_DIR}/${outHeaderFile}
            -DoutCppFile=${CMAKE_CURRENT_BINARY_DIR}/${outCppFile}
-            -P ${CMAKE_MODULE_PATH}/BuildSteps/TokenList2DsnLexer.cmake
+            -P ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/TokenList2DsnLexer.cmake
        COMMENT "TokenList2DsnLexer.cmake creating:
           ${outHeaderFile} and
           ${outCppFile} from
           ${inputFile}"
        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${inputFile}
-                ${CMAKE_MODULE_PATH}/BuildSteps/TokenList2DsnLexer.cmake
+                ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/TokenList2DsnLexer.cmake
        )

    target_sources( ${outputTarget} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/${outCppFile} )
@ -84,11 +84,11 @@ function( generate_lemon_grammar TGT GRAMMAR_DIR CONSUMING_FILE GRAMMAR_FILE )
            -DLEMON_TEMPLATE=${LEMON_TEMPLATE}
            -DGRAMMAR_FILE=${CMAKE_CURRENT_SOURCE_DIR}/${GRAMMAR_FILE}
            -DGRAMMAR_DIR=${CMAKE_CURRENT_BINARY_DIR}/${GRAMMAR_DIR}
-            -P ${CMAKE_MODULE_PATH}/BuildSteps/LemonParserGenerator.cmake
+            -P ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/LemonParserGenerator.cmake
        COMMENT "Running Lemon on ${GRAMMAR_FILE} to generate ${GRAMMAR_DIR}/${GRAMMAR_BASE}.c"
        DEPENDS lemon
                ${CMAKE_CURRENT_SOURCE_DIR}/${GRAMMAR_FILE}
-                ${CMAKE_MODULE_PATH}/BuildSteps/LemonParserGenerator.cmake
+                ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/LemonParserGenerator.cmake
        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${GRAMMAR_DIR}
    )

@ -191,13 +191,13 @@ macro( linux_metadata_translation SRC_FILE OUT_FILE PO_DIR )
            OUTPUT ${OUT_FILE}
            DEPENDS ${SRC_FILE}
                    ${LANG_FILES}
-                    ${CMAKE_MODULE_PATH}/BuildSteps/TranslatePlatformMetadata_linux.cmake
+                    ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/TranslatePlatformMetadata_linux.cmake
            COMMAND ${CMAKE_COMMAND}
                    -DMSGFMT_EXE="${GETTEXT_MSGFMT_EXECUTABLE}"
                    -DPO_DIR="${PO_DIR}"
                    -DSRC_FILE="${SRC_FILE}"
                    -DDEST_FILE="${OUT_FILE}"
-                    -P ${CMAKE_MODULE_PATH}/BuildSteps/TranslatePlatformMetadata_linux.cmake
+                    -P ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/TranslatePlatformMetadata_linux.cmake
            COMMENT "Translating file ${OUT_FNAME}"
            )
    else()
--- a/cmake/KiCadFullVersion.cmake
+++ b/cmake/KiCadFullVersion.cmake
@ -28,7 +28,7 @@
 # KICAD_VERSION_EXTRA is then appended to the base version string.

 # Use git to determine the version string if it's available.
-include( ${CMAKE_MODULE_PATH}/CreateGitVersionHeader.cmake )
+include( ${KICAD_CMAKE_MODULE_PATH}/CreateGitVersionHeader.cmake )
 create_git_version_header( ${SRC_PATH} )

 # $KICAD_VERSION is set in KiCadVersion.cmake or by git (if it is available).
--- a/cmake/WritePlatformMetadata_macos.cmake
+++ b/cmake/WritePlatformMetadata_macos.cmake
@ -29,8 +29,8 @@ message( STATUS "Creating MacOS metadata" )

 # Create the KiCad version strings
 set( SRC_PATH ${PROJECT_SOURCE_DIR} )
-include( ${CMAKE_MODULE_PATH}/KiCadVersion.cmake )
-include( ${CMAKE_MODULE_PATH}/KiCadFullVersion.cmake )
+include( ${KICAD_CMAKE_MODULE_PATH}/KiCadVersion.cmake )
+include( ${KICAD_CMAKE_MODULE_PATH}/KiCadFullVersion.cmake )


 # Configure each plist file from the respurces directory and store it in the build directory
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@ -91,11 +91,11 @@ add_custom_target(
        -DOUTPUT_FILE=${CMAKE_BINARY_DIR}/kicad_build_version.h
        -DTEXT_OUTPUT_FILE=${CMAKE_BINARY_DIR}/kicad_build_version.txt
        -DSRC_PATH=${PROJECT_SOURCE_DIR}
-        -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
-        -P ${CMAKE_MODULE_PATH}/BuildSteps/WriteVersionHeader.cmake
+        -DKICAD_CMAKE_MODULE_PATH=${KICAD_CMAKE_MODULE_PATH}
+        -P ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/WriteVersionHeader.cmake
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
    BYPRODUCTS ${CMAKE_BINARY_DIR}/kicad_build_version.h
-    DEPENDS ${CMAKE_MODULE_PATH}/BuildSteps/WriteVersionHeader.cmake
+    DEPENDS ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/WriteVersionHeader.cmake
    COMMENT "Generating version string header"
    )

--- a/common/gal/CMakeLists.txt
+++ b/common/gal/CMakeLists.txt
@ -77,9 +77,9 @@ function( add_shader outTarget inFile shaderName )
            -DOUT_CPP_FILENAME="${outCppName}"
            -DOUT_HEADER_FILENAME="${outHeaderName}"
            -DOUT_VAR_NAME="${shaderName}"
-            -P ${CMAKE_MODULE_PATH}/BuildSteps/CreateShaderCpp.cmake
+            -P ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/CreateShaderCpp.cmake
        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/shaders/${inFile}
-                ${CMAKE_MODULE_PATH}/BuildSteps/CreateShaderCpp.cmake
+                ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/CreateShaderCpp.cmake
        )

    target_sources( ${outTarget} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/${outCppName} )
--- a/doxygen/docset/CMakeLists.txt
+++ b/doxygen/docset/CMakeLists.txt
@ -62,12 +62,12 @@ if(DOXYGEN_FOUND AND DOXYTAG2ZEALDB AND SED)
            -DDOCSET_BUNDLE_ID=${DOCSET_BUNDLE_ID}
            -DDOCSET_DOXYFILE=${DOCSET_DOXYFILE}
            -DOUTPUT_DIRECTORY="${CMAKE_CURRENT_BINARY_DIR}/doxygen"
-            -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
-            -P ${CMAKE_MODULE_PATH}/BuildSteps/CreateDocsetDoxyfile.cmake
+            -DKICAD_CMAKE_MODULE_PATH=${KICAD_CMAKE_MODULE_PATH}
+            -P ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/CreateDocsetDoxyfile.cmake
        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/
        OUTPUT ${DOCSET_DOXYFILE}
        DEPENDS version_header
-                ${CMAKE_MODULE_PATH}/BuildSteps/CreateDocsetDoxyfile.cmake
+                ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/CreateDocsetDoxyfile.cmake
        COMMENT "Modifying doxyfile for docset creation"
        )

--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@ -381,9 +381,9 @@ add_custom_command(
    COMMAND ${CMAKE_COMMAND}
        -DinputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help.md
        -DoutputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help_md.h
-        -P ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake
-    DEPENDS ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help.md
-    COMMENT "creating ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help_md.h
+        -P ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake
+    DEPENDS ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help.md
+    COMMENT "creating ${KICAD_CMAKE_MODULE_PATH}/dialogs/dialog_bom_help_md.h
       from ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/dialog_bom_help.md"
    )

@ -398,8 +398,8 @@ add_custom_command(
    COMMAND ${CMAKE_COMMAND}
        -DinputFile=${CMAKE_CURRENT_SOURCE_DIR}/sch_text_help.md
        -DoutputFile=${CMAKE_CURRENT_SOURCE_DIR}/sch_text_help_md.h
-        -P ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake
-    DEPENDS ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake ${CMAKE_CURRENT_SOURCE_DIR}/sch_text_help.md
+        -P ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake
+    DEPENDS ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake ${CMAKE_CURRENT_SOURCE_DIR}/sch_text_help.md
    COMMENT "creating ${CMAKE_CURRENT_SOURCE_DIR}/sch_text_help_md.h
       from ${CMAKE_CURRENT_SOURCE_DIR}/sch_text_help.md"
    )
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@ -298,7 +298,7 @@ if( APPLE )
        move_to_main_bundle( \"pl_editor.app\" \"Page Layout Editor.app\" )

        if ( ${PYTHON_FRAMEWORK_HELPER} )
-            include( ${CMAKE_MODULE_PATH}/RefixupMacOS.cmake )
+            include( ${KICAD_CMAKE_MODULE_PATH}/RefixupMacOS.cmake )
            refix_kicad_bundle( ${OSX_BUNDLE_INSTALL_DIR} )
        endif( )

--- a/pcb_calculator/CMakeLists.txt
+++ b/pcb_calculator/CMakeLists.txt
@ -194,8 +194,8 @@ function( html_doc2h inputFile )
    add_custom_command(
        OUTPUT ${inputFile}.h
        COMMAND ${CMAKE_COMMAND} -DinputFile=${inputFile}.html -DoutputFile=${inputFile}.h
-            -P ${CMAKE_MODULE_PATH}/BuildSteps/Html2C.cmake
-        DEPENDS ${inputFile}.html ${CMAKE_MODULE_PATH}/BuildSteps/Html2C.cmake
+            -P ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/Html2C.cmake
+        DEPENDS ${inputFile}.html ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/Html2C.cmake
        COMMENT "creating ${inputFile}.h from ${inputFile}.html"
        )
 endfunction()
@ -208,8 +208,8 @@ function( md_doc2h inputFile )
        OUTPUT ${inputFile}.h

        COMMAND ${CMAKE_COMMAND} -DinputFile=${inputFile}.md -DoutputFile=${inputFile}.h
-            -P ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake
-        DEPENDS ${inputFile}.md ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake
+            -P ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake
+        DEPENDS ${inputFile}.md ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake
        COMMENT "creating ${inputFile}.h from ${inputFile}.md"
        )
 endfunction()
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@ -562,8 +562,8 @@ add_custom_command(
    COMMAND ${CMAKE_COMMAND}
        -DinputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/panel_setup_rules_help.md
        -DoutputFile=${CMAKE_CURRENT_SOURCE_DIR}/dialogs/panel_setup_rules_help_md.h
-        -P ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake
-    DEPENDS ${CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/panel_setup_rules_help.md
+        -P ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake
+    DEPENDS ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/markdown2C.cmake ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/panel_setup_rules_help.md
    COMMENT "creating ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/panel_setup_rules_help_md.h
       from ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/panel_setup_rules_help.md"
    )
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@ -3,7 +3,7 @@
 #################################################
 if( APPLE )
    #TODO Generate this at runtime as well
-    include( ${CMAKE_MODULE_PATH}/WritePlatformMetadata_macos.cmake )
+    include( ${KICAD_CMAKE_MODULE_PATH}/WritePlatformMetadata_macos.cmake )
 elseif( UNIX )
    # Add the command to configure the linux metainfo file with the version information
    add_custom_command(
@ -12,8 +12,8 @@ elseif( UNIX )
            -DSRC_PATH=${PROJECT_SOURCE_DIR}
            -DBUILD_PATH=${PROJECT_BINARY_DIR}
            -DCMAKE_MODULE_PATH=${PROJECT_SOURCE_DIR}/cmake
-            -P ${CMAKE_MODULE_PATH}/BuildSteps/WritePlatformMetadata_linux.cmake
-        DEPENDS ${CMAKE_MODULE_PATH}/BuildSteps/WritePlatformMetadata_linux.cmake
+            -P ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/WritePlatformMetadata_linux.cmake
+        DEPENDS ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/WritePlatformMetadata_linux.cmake
        COMMENT "Configuring Linux metainfo"
        )

--- a/resources/bitmaps_png/CMakeLists.txt
+++ b/resources/bitmaps_png/CMakeLists.txt
@ -740,9 +740,9 @@ function( png2cpp inputFile outFile )
        OUTPUT  ${outFile}

        COMMAND ${CMAKE_COMMAND} -DinputFile=${inputFile} -DoutCppFile=${outFile}
-            -P ${CMAKE_MODULE_PATH}/BuildSteps/PNG2cpp.cmake
+            -P ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/PNG2cpp.cmake

-        DEPENDS ${inputFile} ${CMAKE_MODULE_PATH}/BuildSteps/PNG2cpp.cmake
+        DEPENDS ${inputFile} ${KICAD_CMAKE_MODULE_PATH}/BuildSteps/PNG2cpp.cmake
        COMMENT "Creating ${outFile}"
        )
 endfunction()
--- a/signing/CMakeLists.txt
+++ b/signing/CMakeLists.txt
@ -1,6 +1,6 @@
 if (APPLE AND KICAD_OSX_CODESIGN )
    install( CODE "
-        include( ${CMAKE_MODULE_PATH}/SignMacOS.cmake )
+        include( ${KICAD_CMAKE_MODULE_PATH}/SignMacOS.cmake )

        message( STATUS \"Signing bundles...\" )
        sign_kicad_bundle( \"${OSX_BUNDLE_INSTALL_DIR}\" \"\${KICAD_OSX_SIGNING_ID}\" \"\${KICAD_OSX_SIGNING_USE_SECURE_TIMESTAMP}\" \"\${KICAD_OSX_SIGNING_USE_HARDENED_RUNTIME}\" \"\${KICAD_OSX_SIGNING_ENTITLEMENTS_FILE}\" )