haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMakeLists.txt formatting.

This commit is contained in:
f3nix 2008-03-19 18:05:19 +00:00
parent 357bb9699f
commit f1925912ce
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -38,7 +38,7 @@ if(UNIX)
# When used later, "bin" and others with no leading / is relative to CMAKE_INSTALL_PREFIX. # When used later, "bin" and others with no leading / is relative to CMAKE_INSTALL_PREFIX.
set(KICAD_PLUGINS lib/kicad/plugins CACHE PATH "Location of KiCad plugins.") set(KICAD_PLUGINS lib/kicad/plugins CACHE PATH "Location of KiCad plugins.")
set(KICAD_DATA share/kicad CACHE PATH "Location of KiCad data files.") set(KICAD_DATA share/kicad CACHE PATH "Location of KiCad data files.")
SET(KICAD_DOCS share/doc/kicad CACHE PATH "Location of KiCad documentation files.") set(KICAD_DOCS share/doc/kicad CACHE PATH "Location of KiCad documentation files.")
endif(APPLE) endif(APPLE)
endif(UNIX) endif(UNIX)
@ -48,7 +48,7 @@ if(WIN32)
# When used later, "winexe" and others with no leading / is relative to CMAKE_INSTALL_PREFIX. # When used later, "winexe" and others with no leading / is relative to CMAKE_INSTALL_PREFIX.
set(KICAD_PLUGINS ${KICAD_BIN}/plugins) set(KICAD_PLUGINS ${KICAD_BIN}/plugins)
set(KICAD_DATA share CACHE PATH "Location of KiCad data files.") set(KICAD_DATA share CACHE PATH "Location of KiCad data files.")
SET(KICAD_DOCS doc) set(KICAD_DOCS doc)
endif(WIN32) endif(WIN32)
set(KICAD_DEMOS ${KICAD_DATA}/demos) set(KICAD_DEMOS ${KICAD_DATA}/demos)
@ -108,7 +108,8 @@ add_subdirectory(template)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/install.txt DESTINATION ${KICAD_DOCS} COMPONENT resources) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/install.txt DESTINATION ${KICAD_DOCS} COMPONENT resources)
if(UNIX) if(UNIX)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/share/kicad.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications COMPONENT resources) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/share/kicad.desktop
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/bitmaps/kicad.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps COMPONENT resources) DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications COMPONENT resources)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/bitmaps/kicad.png
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps COMPONENT resources)
endif(UNIX) endif(UNIX)

2
kicad/minizip/CMakeLists.txt
View File

@ -8,7 +8,7 @@ else(ZLIB_FOUND)
# include files are in ${wxWidgets_ROOT_DIR}/src/zlib # include files are in ${wxWidgets_ROOT_DIR}/src/zlib
# and the corresponding library is libwxzlib-<version>.a (like libwxzlib-2.8.a) # and the corresponding library is libwxzlib-<version>.a (like libwxzlib-2.8.a)
# and we try to use it # and we try to use it
INCLUDE_DIRECTORIES( ${wxWidgets_ROOT_DIR}/src/zlib) include_directories(${wxWidgets_ROOT_DIR}/src/zlib)
set(ZLIB_LIBRARIES ${wxWidgets_ROOT_DIR}/lib/libwxzlib-2.8.a) set(ZLIB_LIBRARIES ${wxWidgets_ROOT_DIR}/lib/libwxzlib-2.8.a)
endif(ZLIB_FOUND) endif(ZLIB_FOUND)