Commit 422ffdab authored by f3nix's avatar f3nix
Browse files

CMake: 

* Require CMake version 2.6.1 on Windows and version 2.6.0 for other systems.
* Update FindSubversion to version from CMake 2.6.1 (localization issue solved).
* Remove FindwxWidgetsCVS and use the default one (some issues solved upstream).
* Formatting style changes.
parent bbc4c569

3d-viewer/CMakeLists.txt

+2 −3
Original line number Diff line number Diff line 
add_definitions(-DPCBNEW)



include_directories(

    ../pcbnew

include_directories(../pcbnew

                    ../polygon)



set(3D-VIEWER_SRCS

CMakeLists.txt

+32 −33
Original line number Diff line number Diff line 
project(kicad)



if(NOT APPLE)

    cmake_minimum_required(VERSION 2.4.6 FATAL_ERROR)

else(NOT APPLE)

if(WIN32)

    cmake_minimum_required(VERSION 2.6.1 FATAL_ERROR)

else(WIN32)

    cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)

endif(NOT APPLE)

endif(WIN32)



# Path to local CMake modules.

set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
@@ -23,7 +23,6 @@ option(KICAD_MINIZIP "enable/disable building minizip (default ON)" ON) 
#================================================



if(CMAKE_COMPILER_IS_GNUCXX)



    # Set default flags for Release build.

    set(CMAKE_C_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")

    set(CMAKE_CXX_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
@@ -32,7 +31,6 @@ if(CMAKE_COMPILER_IS_GNUCXX) 
    # Set default flags for Debug build.

    set(CMAKE_C_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")

    set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")



endif(CMAKE_COMPILER_IS_GNUCXX)



# Locations for install targets.
@@ -51,11 +49,15 @@ endif(UNIX) 


if(WIN32)

    # Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.

    set(CMAKE_INSTALL_PREFIX c:/kicad CACHE PATH "")

    set(CMAKE_INSTALL_PREFIX c:/kicad

        CACHE PATH "")

    # Everything without leading / is relative to CMAKE_INSTALL_PREFIX.

    set(KICAD_PLUGINS ${KICAD_BIN}/plugins CACHE PATH "Location of KiCad plugins.")

    set(KICAD_DATA share CACHE PATH "Location of KiCad data files.")

    set(KICAD_DOCS doc CACHE PATH "Location of KiCad documentation files.")

    set(KICAD_PLUGINS ${KICAD_BIN}/plugins

        CACHE PATH "Location of KiCad plugins.")

    set(KICAD_DATA share

        CACHE PATH "Location of KiCad data files.")

    set(KICAD_DOCS doc

        CACHE PATH "Location of KiCad documentation files.")

endif(WIN32)



set(KICAD_DEMOS ${KICAD_DATA}/demos
@@ -83,13 +85,13 @@ include(CheckFindPackageResult) 
#######################

# Find OpenGL library #

#######################

find_package(OpenGL)

find_package(OpenGL QUIET)

check_find_package_result(OPENGL_FOUND "OpenGL")



######################

# Find Boost library #

######################

find_package(Boost)

find_package(Boost QUIET)

check_find_package_result(Boost_FOUND "Boost")



##########################
@@ -98,8 +100,7 @@ check_find_package_result(Boost_FOUND "Boost") 
# Here you can define what libraries of wxWidgets you need for your

# application. You can figure out what libraries you need here;

# http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html

set(wxWidgets_USE_LIBS base core adv gl html net)

find_package(wxWidgetsCVS)

find_package(wxWidgets COMPONENTS base core adv gl html net QUIET)

check_find_package_result(wxWidgets_FOUND "wxWidgets")
@@ -173,7 +174,6 @@ install(FILES freeroute.jnlp 




if(UNIX)



    # set resource dir variables

    #set(KICAD_PROGRAM_ICONS ${CMAKE_INSTALL_PREFIX}/share/kicad/icons)

    set(LINUX_RESOURCES_DIR resources/linux)
@@ -236,5 +236,4 @@ if(UNIX) 
   install(FILES ${LINUX_DESKTOP_ICONS}/kicad_pcbnew.png

           DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps

           COMPONENT resources)



endif(UNIX)

CMakeModules/CreateSVNVersionHeader.cmake

+3 −3
Original line number Diff line number Diff line 
macro(create_svn_version_header)

    # Include Subversion support to automagically create version header file.

    find_package(SubversionCVS)

    find_package(Subversion)

    if(Subversion_FOUND)

        Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Kicad)

        string(REGEX REPLACE "^([0-9]+)\\-([0-9]+)\\-([0-9]+).*" "\\1\\2\\3"

CMakeModules/FindPackageHandleStandardArgs.cmake

deleted100644 → 0
+0 −56
Original line number Diff line number Diff line 
# CMake CVS r1.3



# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME (DEFAULT_MSG|"Custom failure message") VAR1 ... )

#    This macro is intended to be used in FindXXX.cmake modules files.

#    It handles the REQUIRED and QUIET argument to FIND_PACKAGE() and

#    it also sets the <UPPERCASED_NAME>_FOUND variable.

#    The package is found if all variables listed are TRUE.

#    Example:

#

#    FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR)

#

#    LibXml2 is considered to be found, if both LIBXML2_LIBRARIES and 

#    LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE.

#    If it is not found and REQUIRED was used, it fails with FATAL_ERROR, 

#    independent whether QUIET was used or not.

#    If it is found, the location is reported using the VAR1 argument, so 

#    here a message "Found LibXml2: /usr/lib/libxml2.so" will be printed out.

#    If the second argument is DEFAULT_MSG, the message in the failure case will 

#    be "Could NOT find LibXml2", if you don't like this message you can specify

#    your own custom failure message there.



MACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 )



  IF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")

    SET(_FAIL_MESSAGE "Could NOT find ${_NAME}")

  ELSE("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")

    SET(_FAIL_MESSAGE "${_FAIL_MSG}")

  ENDIF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")



  STRING(TOUPPER ${_NAME} _NAME_UPPER)



  SET(${_NAME_UPPER}_FOUND TRUE)

  IF(NOT ${_VAR1})

    SET(${_NAME_UPPER}_FOUND FALSE)

  ENDIF(NOT ${_VAR1})



  FOREACH(_CURRENT_VAR ${ARGN})

    IF(NOT ${_CURRENT_VAR})

      SET(${_NAME_UPPER}_FOUND FALSE)

    ENDIF(NOT ${_CURRENT_VAR})

  ENDFOREACH(_CURRENT_VAR)



  IF (${_NAME_UPPER}_FOUND)

#     IF (NOT ${_NAME}_FIND_QUIETLY)

#         MESSAGE(STATUS "Found ${_NAME}: ${${_VAR1}}")

#     ENDIF (NOT ${_NAME}_FIND_QUIETLY)

  ELSE (${_NAME_UPPER}_FOUND)

    IF (${_NAME}_FIND_REQUIRED)

        MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE}")

    ELSE (${_NAME}_FIND_REQUIRED)

      IF (NOT ${_NAME}_FIND_QUIETLY)

        MESSAGE(STATUS "${_FAIL_MESSAGE}")

      ENDIF (NOT ${_NAME}_FIND_QUIETLY)

    ENDIF (${_NAME}_FIND_REQUIRED)

  ENDIF (${_NAME_UPPER}_FOUND)

ENDMACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS)

CMakeModules/FindSubversionCVS.cmake→CMakeModules/FindSubversion.cmake

+24 −13
Original line number Diff line number Diff line 
# CMake CVS r1.2.2.2

#

# From CMake 2.6.1

#



# 

# - Extract information from a subversion working copy

# The module defines the following variables:
@@ -22,6 +25,8 @@ 
#  IF(Subversion_FOUND)

#    Subversion_WC_INFO(${PROJECT_SOURCE_DIR} Project)

#    MESSAGE("Current revision is ${Project_WC_REVISION}")

#    Subversion_WC_LOG(${PROJECT_SOURCE_DIR} Project)

#    MESSAGE("Last changed log is ${Project_LAST_CHANGED_LOG}")

#  ENDIF(Subversion_FOUND)



# Copyright (c) 2006, Tristan Carel
@@ -49,17 +54,11 @@ 
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.



# $Id: FindSubversion.cmake,v 1.2.2.2 2008/03/26 18:08:24 hoffman Exp $

# $Id: FindSubversion.cmake,v 1.2.2.3 2008-05-23 20:09:34 hoffman Exp $



SET(Subversion_FOUND FALSE)

SET(Subversion_SVN_FOUND FALSE)



# the subversion commands should be executed with the C locale, otherwise

# the message (which are parsed) may be translated, Alex

SET(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}" )

SET(ENV{LC_ALL} C)

SET(ENV{LANG} C)



FIND_PROGRAM(Subversion_SVN_EXECUTABLE svn

  DOC "subversion command line client")

MARK_AS_ADVANCED(Subversion_SVN_EXECUTABLE)
@@ -69,6 +68,11 @@ IF(Subversion_SVN_EXECUTABLE) 
  SET(Subversion_FOUND TRUE)



  MACRO(Subversion_WC_INFO dir prefix)

    # the subversion commands should be executed with the C locale, otherwise

    # the message (which are parsed) may be translated, Alex

    SET(_Subversion_SAVED_LC_ALL "$ENV{LC_ALL}")

    SET(ENV{LC_ALL} C)



    EXECUTE_PROCESS(COMMAND ${Subversion_SVN_EXECUTABLE} --version

      WORKING_DIRECTORY ${dir}

      OUTPUT_VARIABLE Subversion_VERSION_SVN
@@ -99,9 +103,19 @@ IF(Subversion_SVN_EXECUTABLE) 


    ENDIF(NOT ${Subversion_svn_info_result} EQUAL 0)



    # restore the previous LC_ALL

    SET(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL})



  ENDMACRO(Subversion_WC_INFO)



  MACRO(Subversion_WC_LOG dir prefix)

    # This macro can block if the certificate is not signed:

    # svn ask you to accept the certificate and wait for your answer

    # This macro requires a svn server network access (Internet most of the time)

    # and can also be slow since it access the svn server

    EXECUTE_PROCESS(COMMAND

      ${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}

      OUTPUT_VARIABLE Subversion_LAST_CHANGED_LOG

      OUTPUT_VARIABLE ${prefix}_LAST_CHANGED_LOG

      ERROR_VARIABLE Subversion_svn_log_error

      RESULT_VARIABLE Subversion_svn_log_result

      OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -109,13 +123,10 @@ IF(Subversion_SVN_EXECUTABLE) 
    IF(NOT ${Subversion_svn_log_result} EQUAL 0)

      MESSAGE(SEND_ERROR "Command \"${Subversion_SVN_EXECUTABLE} log -r BASE ${dir}\" failed with output:\n${Subversion_svn_log_error}")

    ENDIF(NOT ${Subversion_svn_log_result} EQUAL 0)

  ENDMACRO(Subversion_WC_INFO)

  ENDMACRO(Subversion_WC_LOG)



ENDIF(Subversion_SVN_EXECUTABLE)



# restore the previous LC_ALL

SET(ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL})



IF(NOT Subversion_FOUND)

  IF(NOT Subversion_FIND_QUIETLY)

    MESSAGE(STATUS "Subversion was not found.")