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

Some small CMake fixes.

This commit is contained in:
f3nix 2007-12-02 13:56:03 +00:00
parent ec3f678a22
commit 4fd9325f6d
3 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -7,6 +7,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR)
# Uncomment this line if you want verbose build messages. # Uncomment this line if you want verbose build messages.
#SET(CMAKE_VERBOSE_MAKEFILE ON) #SET(CMAKE_VERBOSE_MAKEFILE ON)
# Set default flags for Debug build
SET(CMAKE_C_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")
SET(CMAKE_CXX_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")
# Set default flags for Release build
SET(CMAKE_C_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
SET(CMAKE_CXX_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "-s")
# Here you can define what libraries of wxWidgets you need for your # Here you can define what libraries of wxWidgets you need for your
# application. You can figure out what libraries you need here; # application. You can figure out what libraries you need here;
# http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html # http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html
@ -17,6 +25,8 @@ FIND_PACKAGE(wxWidgets REQUIRED)
# Locations for install targets # Locations for install targets
IF(UNIX) IF(UNIX)
IF(APPLE)
ELSE(APPLE)
#SET(CMAKE_INSTALL_PATH /usr/local) #SET(CMAKE_INSTALL_PATH /usr/local)
SET(KICAD_BIN bin CACHE PATH "Location of KiCad binaries.") SET(KICAD_BIN bin CACHE PATH "Location of KiCad binaries.")
SET(KICAD_PLUGINS lib/kicad/plugins CACHE PATH "Location of KiCad plugins.") SET(KICAD_PLUGINS lib/kicad/plugins CACHE PATH "Location of KiCad plugins.")
@ -26,21 +36,17 @@ IF(UNIX)
SET(KICAD_LIBRARY ${KICAD_DATA}/library) SET(KICAD_LIBRARY ${KICAD_DATA}/library)
SET(KICAD_INTERNAT ${KICAD_DATA}/internat) SET(KICAD_INTERNAT ${KICAD_DATA}/internat)
SET(KICAD_TEMPLATE ${KICAD_DATA}/template) SET(KICAD_TEMPLATE ${KICAD_DATA}/template)
ENDIF(APPLE)
ENDIF(UNIX) ENDIF(UNIX)
IF(WIN32) IF(WIN32)
ENDIF(WIN32) ENDIF(WIN32)
# Should this go to IF(UNIX)?
IF(APPLE)
ENDIF(APPLE)
# Did we find wxWidgets ? This condition will fail # Did we find wxWidgets ? This condition will fail
# for as long as the internal vars do not point to # for as long as the internal vars do not point to
# the proper wxWidgets configuration. # the proper wxWidgets configuration.
MESSAGE("-- Check for installed wxWidgets:")
IF(wxWidgets_FOUND) IF(wxWidgets_FOUND)
MESSAGE(" wxWidgets found") MESSAGE(STATUS "Check for installed wxWidgets -- found")
# Include wxWidgets macros. # Include wxWidgets macros.
INCLUDE(${wxWidgets_USE_FILE}) INCLUDE(${wxWidgets_USE_FILE})
@ -61,7 +67,8 @@ IF(wxWidgets_FOUND)
ADD_SUBDIRECTORY(pcbnew) ADD_SUBDIRECTORY(pcbnew)
ELSE(wxWidgets_FOUND) ELSE(wxWidgets_FOUND)
# For convenience. When we cannot continue, inform the user. # For convenience. When we cannot continue, inform the user.
MESSAGE(" Error: wxWidgets doesn't found (it is required to build KiCad!)") MESSAGE(STATUS "Check for installed wxWidgets -- not found")
MESSAGE(FATAL_ERROR "wxWidgets was not found - it is required to build KiCad")
ENDIF(wxWidgets_FOUND) ENDIF(wxWidgets_FOUND)
# CMake will look at this dirs for nested 'CMakeLists.txt' files # CMake will look at this dirs for nested 'CMakeLists.txt' files

1
common/CMakeLists.txt
View File

@ -33,5 +33,4 @@ SET(COMMON_SRCS
worksheet.cpp worksheet.cpp
wxwineda.cpp) wxwineda.cpp)
ADD_LIBRARY(common ${COMMON_SRCS}) ADD_LIBRARY(common ${COMMON_SRCS})

5
kicad/minizip/CMakeLists.txt
View File

@ -1,8 +1,7 @@
FIND_PACKAGE(ZLIB) FIND_PACKAGE(ZLIB)
MESSAGE("-- Check for installed ZLIB:")
IF(ZLIB_FOUND) IF(ZLIB_FOUND)
MESSAGE(" ZLIB found") MESSAGE(STATUS "Check for installed ZLIB -- found")
SET(MINIZIP_SRCS SET(MINIZIP_SRCS
ioapi.c ioapi.c
minizip.c minizip.c
@ -14,5 +13,5 @@ IF(ZLIB_FOUND)
INSTALL(TARGETS minizip RUNTIME DESTINATION bin) INSTALL(TARGETS minizip RUNTIME DESTINATION bin)
ELSE(ZLIB_FOUND) ELSE(ZLIB_FOUND)
MESSAGE(" ZLIB not found") MESSAGE(STATUS "Check for installed ZLIB -- not found")
ENDIF(ZLIB_FOUND) ENDIF(ZLIB_FOUND)