Fixing regression build

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d52b39e86c8589ce63a59c1ca454f05ea858e26a..a68fc2fa0142e5e3e11bcb9260a0293f907c4d9c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,10 +152,10 @@ add_custom_target( SizeAfter ALL ${SIZE} --target=${FORMAT} ${TARGET_HEX} ${TARG
 #| teensy-loader-cli must be in the user's path
 if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
        configure_file( LoadFile/bash load )
-endif( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
+endif()
 
 #| TODO Windows
 if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
        configure_file( LoadFile/bash load )
-endif( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
+endif()
 

diff --git a/setup.cmake b/setup.cmake
index 6e2dae557855ab933eee52b68fc10ab445688d03..f36457053f68e4ff1f55e3f1d48f89f7dc642a06 100644 (file)
--- a/setup.cmake
+++ b/setup.cmake
@@ -37,9 +37,9 @@ set( DebugModule  "full"   )
 ###
 # Module Overrides (Used in the buildall.bash script)
 #
-if ( ( DEFINED ${ScanModuleOverride} ) AND ( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Scan/${ScanModuleOverride} ) )
+if ( ( DEFINED ScanModuleOverride ) AND ( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Scan/${ScanModuleOverride} ) )
        set( ScanModule ${ScanModuleOverride} )
-endif ( ( DEFINED ${ScanModuleOverride} ) AND ( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Scan/${ScanModuleOverride} ) )
+endif ()
 
 
 
@@ -72,7 +72,7 @@ function( ModuleCompatibility ModulePath )
        endforeach( mod_var ${ARGN} )
 
        message( FATAL_ERROR "${ModulePath} does not support the ${COMPILER_FAMILY} family..." )
-endfunction( ModuleCompatibility ModulePath )
+endfunction()
 
 
 
@@ -166,7 +166,7 @@ execute_process( COMMAND git status -s -uno --porcelain
 string( LENGTH "${Git_Modified_INFO}" Git_Modified_LENGTH )
 if ( ${Git_Modified_LENGTH} GREATER 2 )
        string( SUBSTRING "${Git_Modified_INFO}" 1 2 Git_Modified_Flag_INFO )
-endif ( ${Git_Modified_LENGTH} GREATER 2 )
+endif ()
 
 #| Branch
 execute_process( COMMAND git rev-parse --abbrev-ref HEAD
@@ -189,10 +189,10 @@ execute_process( COMMAND git show -s --format=%ci
 #| Only use Git variables if we were successful in calling the commands
 if ( ${Git_RETURN} EQUAL 0 )
        set( GitLastCommitDate "${Git_Modified_Flag_INFO}${Git_Branch_INFO} - ${Git_Date_INFO}" )
-else ( ${Git_RETURN} EQUAL 0 )
+else ()
        # TODO Figure out a good way of finding the current branch + commit date + modified
        set( GitLastCommitDate "Pft...Windows Build" )
-endif ( ${Git_RETURN} EQUAL 0 )
+endif ()
 
 
 #| Uses CMake variables to include as defines