changeset 80:ef802d786748

Fixing regression build
author Jacob Alexander <triplehaata@gmail.com>
date Fri, 01 Feb 2013 21:19:31 -0500
parents b9f4eeb89b80
children 3d4cf158742e
files CMakeLists.txt setup.cmake
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Fri Feb 01 20:30:14 2013 -0500
+++ b/CMakeLists.txt	Fri Feb 01 21:19:31 2013 -0500
@@ -152,10 +152,10 @@
 #| 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()
 
--- a/setup.cmake	Fri Feb 01 20:30:14 2013 -0500
+++ b/setup.cmake	Fri Feb 01 21:19:31 2013 -0500
@@ -37,9 +37,9 @@
 ###
 # 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 @@
 	endforeach( mod_var ${ARGN} )
 
 	message( FATAL_ERROR "${ModulePath} does not support the ${COMPILER_FAMILY} family..." )
-endfunction( ModuleCompatibility ModulePath )
+endfunction()
 
 
 
@@ -166,7 +166,7 @@
 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 @@
 #| 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