Merge pull request #48 from mattventura/master

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

diff --git a/Lib/CMake/kll.cmake b/Lib/CMake/kll.cmake
index 5d007d2e3d9c0029e20b1324800a47b37e638488..80d44c176822d5f281b0a7e4155ca5d4376e9fdc 100644 (file)
--- a/Lib/CMake/kll.cmake
+++ b/Lib/CMake/kll.cmake
@@ -57,9 +57,11 @@ set ( pathname "${PROJECT_SOURCE_DIR}/${ScanModulePath}" )
 if ( NOT EXISTS ${pathname}/${BaseMap}.kll )
        set ( BaseMap_Args ${BaseMap_Args} ${pathname}/defaultMap.kll )
        set ( KLL_DEPENDS ${KLL_DEPENDS} ${pathname}/defaultMap.kll )
-else ()
+elseif ( EXISTS "${pathname}/${BaseMap}.kll" )
        set ( BaseMap_Args ${BaseMap_Args} ${pathname}/${BaseMap}.kll )
        set ( KLL_DEPENDS ${KLL_DEPENDS} ${pathname}/${BaseMap}.kll )
+else ()
+       message ( FATAL "Could not find '${BaseMap}.kll'" )
 endif ()
 
 #| Configure DefaultMap if specified
@@ -71,10 +73,12 @@ if ( NOT "${DefaultMap}" STREQUAL "" )
                # Check if kll file is in build directory, otherwise default to layout directory
                if ( EXISTS "${PROJECT_BINARY_DIR}/${MAP}.kll" )
                        set ( DefaultMap_Args ${DefaultMap_Args} ${MAP}.kll )
-                       set ( KLL_DEPENDS ${KLL_DEPENDS} ${MAP}.kll )
-               else ()
+                       set ( KLL_DEPENDS ${KLL_DEPENDS} ${PROJECT_BINARY_DIR}/${MAP}.kll )
+               elseif ( EXISTS "${PROJECT_SOURCE_DIR}/kll/layouts/${MAP}.kll" )
                        set ( DefaultMap_Args ${DefaultMap_Args} ${PROJECT_SOURCE_DIR}/kll/layouts/${MAP}.kll )
                        set ( KLL_DEPENDS ${KLL_DEPENDS} ${PROJECT_SOURCE_DIR}/kll/layouts/${MAP}.kll )
+               else ()
+                       message ( FATAL "Could not find '${MAP}.kll'" )
                endif ()
        endforeach ()
 endif ()
@@ -91,10 +95,12 @@ if ( NOT "${PartialMaps}" STREQUAL "" )
                        # Check if kll file is in build directory, otherwise default to layout directory
                        if ( EXISTS "${PROJECT_BINARY_DIR}/${MAP_PART}.kll" )
                                set ( PartialMap_Args ${PartialMap_Args} ${MAP_PART}.kll )
-                               set ( KLL_DEPENDS ${KLL_DEPENDS} ${MAP_PART}.kll )
-                       else ()
+                               set ( KLL_DEPENDS ${KLL_DEPENDS} ${PROJECT_BINARY_DIR}/${MAP_PART}.kll )
+                       elseif ( EXISTS "${PROJECT_SOURCE_DIR}/kll/layouts/${MAP_PART}.kll" )
                                set ( PartialMap_Args ${PartialMap_Args} ${PROJECT_SOURCE_DIR}/kll/layouts/${MAP_PART}.kll )
                                set ( KLL_DEPENDS ${KLL_DEPENDS} ${PROJECT_SOURCE_DIR}/kll/layouts/${MAP_PART}.kll )
+                       else ()
+                               message ( FATAL "Could not find '${MAP_PART}.kll'" )
                        endif ()
                endforeach ()
        endforeach ()