Adding convenience build target for testing out kll compiler changes.

[kiibohd-controller.git] / Lib / CMake / kll.cmake

diff --git a/Lib/CMake/kll.cmake b/Lib/CMake/kll.cmake
index e9794fda1ef7466b3dfcf175593446344776aedc..fe28a09a657abd4bc6a31ab7c31871c984cf179d 100644 (file)
--- a/Lib/CMake/kll.cmake
+++ b/Lib/CMake/kll.cmake
@@ -20,6 +20,8 @@ if ( "${MacroModule}" STREQUAL "PartialMap" )
 #
 
 if ( NOT EXISTS "${PROJECT_SOURCE_DIR}/kll/kll.py" )
+       message ( STATUS "Downloading latest kll version:" )
+
        # Make sure git is available
        find_package ( Git REQUIRED )
 
@@ -27,6 +29,13 @@ if ( NOT EXISTS "${PROJECT_SOURCE_DIR}/kll/kll.py" )
        execute_process ( COMMAND ${GIT_EXECUTABLE} clone https://github.com/kiibohd/kll.git
                WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
        )
+elseif ( REFRESH_KLL ) # Otherwise attempt to update the repo
+       message ( STATUS "Checking for latest kll version:" )
+
+       # Clone kll git repo
+       execute_process ( COMMAND ${GIT_EXECUTABLE} pull --rebase
+               WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/kll
+       )
 endif () # kll/kll.py exists
 
 
@@ -49,7 +58,7 @@ endforeach ()
 
 #| If set BaseMap cannot be found, use default map
 set ( pathname "${PROJECT_SOURCE_DIR}/${ScanModulePath}" )
-if ( NOT EXISTS "${filename}/${BaseMap}.kll" )
+if ( NOT EXISTS ${pathname}/${BaseMap}.kll )
        set ( BaseMap_Args ${BaseMap_Args} ${pathname}/defaultMap.kll )
        set ( KLL_DEPENDS ${KLL_DEPENDS} ${pathname}/defaultMap.kll )
 else ()
@@ -96,25 +105,40 @@ if ( NOT "${PartialMaps}" STREQUAL "" )
 endif ()
 
 
+#| Print list of layout sources used
+message ( STATUS "Detected Layout Files:" )
+foreach ( filename ${KLL_DEPENDS} )
+       message ( "${filename}" )
+endforeach ()
+
+
 
 ###
 # Run KLL Compiler
 #
 
 #| KLL Options
-set ( kll_backend    -b kiibohd )
-set ( kll_template   -t ${PROJECT_SOURCE_DIR}/kll/templates/kiibohdKeymap.h )
+set ( kll_backend   -b kiibohd )
+set ( kll_template  -t ${PROJECT_SOURCE_DIR}/kll/templates/kiibohdKeymap.h )
 set ( kll_outputname generatedKeymap.h )
-set ( kll_output     -o ${kll_outputname} )
+set ( kll_output    -o ${kll_outputname} )
+set ( kll_define_output   --defines-output kll_defs.h )
+set ( kll_define_template --defines-template ${PROJECT_SOURCE_DIR}/kll/templates/kiibohdDefs.h )
 
 #| KLL Cmd
-set ( kll_cmd ${PROJECT_SOURCE_DIR}/kll/kll.py ${BaseMap_Args} ${DefaultMap_Args} ${PartialMap_Args} ${kll_backend} ${kll_template} ${kll_output} )
+set ( kll_cmd ${PROJECT_SOURCE_DIR}/kll/kll.py ${BaseMap_Args} ${DefaultMap_Args} ${PartialMap_Args} ${kll_backend} ${kll_template} ${kll_output} ${kll_define_template} ${kll_define_output} )
 add_custom_command ( OUTPUT ${kll_outputname}
        COMMAND ${kll_cmd}
        DEPENDS ${KLL_DEPENDS}
        COMMENT "Generating KLL Layout"
 )
 
+#| KLL Regen Convenience Target
+add_custom_target ( kll_regen
+       COMMAND ${kll_cmd}
+       COMMENT "Re-generating KLL Layout"
+)
+
 #| Append generated file to required sources so it becomes a dependency in the main build
 set ( SRCS ${SRCS} ${kll_outputname} )