Formatting, cleanup.

This commit is contained in:
Dick Hollenbeck 2014-01-17 13:56:42 -06:00
parent 8273afe8e4
commit 26e2f9f67a

View file

@ -1,10 +1,6 @@
project( kicad-library ) project( kicad-library )
if(WIN32)
cmake_minimum_required( VERSION 2.6.1 FATAL_ERROR ) cmake_minimum_required( VERSION 2.6.1 FATAL_ERROR )
else(WIN32)
cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
endif(WIN32)
# Locations for install targets. # Locations for install targets.
if( UNIX ) if( UNIX )
@ -18,7 +14,7 @@ if(UNIX)
set( KICAD_MODULES ${KICAD_DATA}/modules ) set( KICAD_MODULES ${KICAD_DATA}/modules )
set( KICAD_LIBRARY ${KICAD_DATA}/library ) set( KICAD_LIBRARY ${KICAD_DATA}/library )
set( KICAD_TEMPLATE ${KICAD_DATA}/template ) set( KICAD_TEMPLATE ${KICAD_DATA}/template )
else(APPLE) else()
# Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line. # Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
set( CMAKE_INSTALL_PREFIX /usr/local set( CMAKE_INSTALL_PREFIX /usr/local
CACHE PATH "") CACHE PATH "")
@ -28,8 +24,8 @@ if(UNIX)
set( KICAD_MODULES ${KICAD_DATA}/modules ) set( KICAD_MODULES ${KICAD_DATA}/modules )
set( KICAD_LIBRARY ${KICAD_DATA}/library ) set( KICAD_LIBRARY ${KICAD_DATA}/library )
set( KICAD_TEMPLATE ${KICAD_DATA}/template ) set( KICAD_TEMPLATE ${KICAD_DATA}/template )
endif(APPLE) endif()
endif(UNIX) endif()
if(WIN32) if(WIN32)
# Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line. # Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
@ -39,7 +35,7 @@ if(WIN32)
set( KICAD_MODULES modules ) set( KICAD_MODULES modules )
set( KICAD_LIBRARY library ) set( KICAD_LIBRARY library )
set( KICAD_TEMPLATE template ) set( KICAD_TEMPLATE template )
endif(WIN32) endif()
mark_as_advanced( KICAD_DATA KICAD_MODULES KICAD_LIBRARY ) mark_as_advanced( KICAD_DATA KICAD_MODULES KICAD_LIBRARY )