Formatting, cleanup.

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

View file

@ -1,45 +1,41 @@
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 )
if(APPLE) if( APPLE )
# 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 / set( CMAKE_INSTALL_PREFIX /
CACHE PATH "" )
# Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
set( KICAD_DATA "Library/Application Support/kicad/"
CACHE PATH "Location of KiCad data files." )
set( KICAD_MODULES ${KICAD_DATA}/modules )
set( KICAD_LIBRARY ${KICAD_DATA}/library )
set( KICAD_TEMPLATE ${KICAD_DATA}/template )
else()
# Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
set( CMAKE_INSTALL_PREFIX /usr/local
CACHE PATH "") CACHE PATH "")
# Everything without leading / is relative to CMAKE_INSTALL_PREFIX. # Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
set(KICAD_DATA "Library/Application Support/kicad/" set( KICAD_DATA share/kicad
CACHE PATH "Location of KiCad data files.") CACHE PATH "Location of KiCad data files." )
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) endif()
# Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line. endif()
set(CMAKE_INSTALL_PREFIX /usr/local
CACHE PATH "")
# Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
set(KICAD_DATA share/kicad
CACHE PATH "Location of KiCad data files.")
set(KICAD_MODULES ${KICAD_DATA}/modules)
set(KICAD_LIBRARY ${KICAD_DATA}/library)
set(KICAD_TEMPLATE ${KICAD_DATA}/template)
endif(APPLE)
endif(UNIX)
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.
set(CMAKE_INSTALL_PREFIX c:/kicad set( CMAKE_INSTALL_PREFIX c:/kicad
CACHE PATH "") CACHE PATH "" )
# Everything without leading / is relative to CMAKE_INSTALL_PREFIX. # Everything without leading / is relative to CMAKE_INSTALL_PREFIX.
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 )
@ -66,6 +62,6 @@ add_custom_target( uninstall
# CMake will look in these dirs for nested 'CMakeLists.txt' files. # CMake will look in these dirs for nested 'CMakeLists.txt' files.
# Resources. # Resources.
add_subdirectory(library) add_subdirectory( library )
add_subdirectory(modules) add_subdirectory( modules )
add_subdirectory(template) add_subdirectory( template )