[Cmake-commits] [cmake-commits] hoffman committed CPack.Info.plist.in 1.5 1.5.2.1 CPack.cmake 1.35.2.2 1.35.2.3 CPack.distribution.dist.in NONE 1.2.2.2 FindBLAS.cmake 1.1.2.1 1.1.2.2 FindFLTK.cmake 1.36 1.36.14.1 FindKDE3.cmake 1.10.2.1 1.10.2.2 FindMatlab.cmake 1.3 1.3.14.1 FindOpenSSL.cmake 1.1 1.1.14.1 FindQt3.cmake 1.16.4.1 1.16.4.2 FindSWIG.cmake 1.10 1.10.2.1 FindwxWidgets.cmake 1.18.2.1 1.18.2.2 NSIS.template.in 1.25.2.1 1.25.2.2
cmake-commits at cmake.org
cmake-commits at cmake.org
Wed Jun 25 09:51:34 EDT 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv13020/Modules
Modified Files:
Tag: CMake-2-6
CPack.Info.plist.in CPack.cmake FindBLAS.cmake FindFLTK.cmake
FindKDE3.cmake FindMatlab.cmake FindOpenSSL.cmake
FindQt3.cmake FindSWIG.cmake FindwxWidgets.cmake
NSIS.template.in
Added Files:
Tag: CMake-2-6
CPack.distribution.dist.in
Log Message:
ENH: merge in changes from main tree
Index: FindFLTK.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindFLTK.cmake,v
retrieving revision 1.36
retrieving revision 1.36.14.1
diff -C 2 -d -r1.36 -r1.36.14.1
*** FindFLTK.cmake 15 Dec 2005 15:41:19 -0000 1.36
--- FindFLTK.cmake 25 Jun 2008 13:51:31 -0000 1.36.14.1
***************
*** 12,15 ****
--- 12,20 ----
# FLTK_IMAGES_LIBRARY = the full path to fltk_images.lib
+ IF (FLTK_INCLUDE_DIR)
+ # Already in cache, be silent
+ SET(FLTK_FIND_QUIETLY TRUE)
+ ENDIF (FLTK_INCLUDE_DIR)
+
# Platform dependent libraries required by FLTK
IF(WIN32)
***************
*** 25,29 ****
IF(UNIX)
INCLUDE(${CMAKE_ROOT}/Modules/FindX11.cmake)
! SET( FLTK_PLATFORM_DEPENDENT_LIBS ${X11_LIBRARIES} -lm)
ENDIF(UNIX)
--- 30,35 ----
IF(UNIX)
INCLUDE(${CMAKE_ROOT}/Modules/FindX11.cmake)
! FIND_LIBRARY(FLTK_MATH_LIBRARY m)
! SET( FLTK_PLATFORM_DEPENDENT_LIBS ${X11_LIBRARIES} ${FLTK_MATH_LIBRARY})
ENDIF(UNIX)
***************
*** 33,37 ****
IF(CYGWIN)
! SET( FLTK_PLATFORM_DEPENDENT_LIBS ole32 uuid comctl32 wsock32 supc++ -lm -lgdi32)
ENDIF(CYGWIN)
--- 39,44 ----
IF(CYGWIN)
! FIND_LIBRARY(FLTK_MATH_LIBRARY m)
! SET( FLTK_PLATFORM_DEPENDENT_LIBS ole32 uuid comctl32 wsock32 supc++ ${FLTK_MATH_LIBRARY} -lgdi32)
ENDIF(CYGWIN)
***************
*** 97,104 ****
ENDIF(NOT FLTK_DIR)
- # If FLTK was found, load the configuration file to get the rest of the
- # settings.
- IF(FLTK_DIR)
-
# Check if FLTK was built using CMake
IF(EXISTS ${FLTK_DIR}/FLTKConfig.cmake)
--- 104,107 ----
***************
*** 171,176 ****
SET(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH}
- /usr/local/include
- /usr/include
/usr/local/fltk
/usr/X11R6/include
--- 174,177 ----
***************
*** 180,185 ****
SET(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH}
- /usr/lib
- /usr/local/lib
/usr/local/fltk/lib
/usr/X11R6/lib
--- 181,184 ----
***************
*** 216,220 ****
ENDIF(FLTK_BUILT_WITH_CMAKE)
- ENDIF(FLTK_DIR)
--- 215,218 ----
***************
*** 243,244 ****
--- 241,245 ----
SET (FLTK_LIBRARY ${FLTK_LIBRARIES})
ENDIF(FLTK_FOUND)
+
+ INCLUDE(FindPackageHandleStandardArgs)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(FLTK DEFAULT_MSG FLTK_LIBRARIES FLTK_INCLUDE_DIR)
Index: NSIS.template.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/NSIS.template.in,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -C 2 -d -r1.25.2.1 -r1.25.2.2
*** NSIS.template.in 15 May 2008 19:39:50 -0000 1.25.2.1
--- NSIS.template.in 25 Jun 2008 13:51:32 -0000 1.25.2.2
***************
*** 37,85 ****
;Set compression
SetCompressor @CPACK_NSIS_COMPRESSOR@
! ;--------------------------------
! ; determine admin versus local install
! ; Is install for "AllUsers" or "JustMe"?
! ; Default to "JustMe" - set to "AllUsers" if admin or on Win9x
! ; This function is used for the very first "custom page" of the installer.
! ; This custom page does not show up visibly, but it executes prior to the
! ; first visible page and sets up $INSTDIR properly...
! ; Choose different default installation folder based on SV_ALLUSERS...
! ; "Program Files" for AllUsers, "My Documents" for JustMe...
! Function .onInit
! StrCpy $SV_ALLUSERS "JustMe"
! StrCpy $INSTDIR "$DOCUMENTS\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
ClearErrors
! UserInfo::GetName
! IfErrors noLM
! Pop $0
! UserInfo::GetAccountType
! Pop $1
! StrCmp $1 "Admin" 0 +3
! SetShellVarContext all
! ;MessageBox MB_OK 'User "$0" is in the Admin group'
! StrCpy $SV_ALLUSERS "AllUsers"
! Goto done
! StrCmp $1 "Power" 0 +3
! SetShellVarContext all
! ;MessageBox MB_OK 'User "$0" is in the Power Users group'
! StrCpy $SV_ALLUSERS "AllUsers"
! Goto done
!
! noLM:
! StrCpy $SV_ALLUSERS "AllUsers"
! ;Get installation folder from registry if available
!
! done:
! StrCmp $SV_ALLUSERS "AllUsers" 0 +2
! StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
! StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage
! !insertmacro MUI_INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"
! noOptionsPage:
! FunctionEnd
;--------------------------------
--- 37,140 ----
;Set compression
SetCompressor @CPACK_NSIS_COMPRESSOR@
+
+ !include Sections.nsh
+
+ ;--- Component support macros: ---
+ ; The code for the add/remove functionality is from:
+ ; http://nsis.sourceforge.net/Add/Remove_Functionality
+ ; It has been modified slightly and extended to provide
+ ; inter-component dependencies.
+ Var AR_SecFlags
+ Var AR_RegFlags
+ @CPACK_NSIS_SECTION_SELECTED_VARS@
! ; Loads the "selected" flag for the section named SecName into the
! ; variable VarName.
! !macro LoadSectionSelectedIntoVar SecName VarName
! SectionGetFlags ${${SecName}} $${VarName}
! IntOp $${VarName} $${VarName} & ${SF_SELECTED} ;Turn off all other bits
! !macroend
! ; Loads the value of a variable... can we get around this?
! !macro LoadVar VarName
! IntOp $R0 0 + $${VarName}
! !macroend
+ !macro InitSection SecName
+ ; This macro reads component installed flag from the registry and
+ ;changes checked state of the section on the components page.
+ ;Input: section index constant name specified in Section command.
+
ClearErrors
! ;Reading component status from registry
! ReadRegDWORD $AR_RegFlags HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@\Components\${SecName}" "Installed"
! IfErrors "default_${SecName}"
! ;Status will stay default if registry value not found
! ;(component was never installed)
! IntOp $AR_RegFlags $AR_RegFlags & ${SF_SELECTED} ;Turn off all other bits
! SectionGetFlags ${${SecName}} $AR_SecFlags ;Reading default section flags
! IntOp $AR_SecFlags $AR_SecFlags & 0xFFFE ;Turn lowest (enabled) bit off
! IntOp $AR_SecFlags $AR_RegFlags | $AR_SecFlags ;Change lowest bit
! ;Writing modified flags
! SectionSetFlags ${${SecName}} $AR_SecFlags
!
! "default_${SecName}:"
! !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
! !macroend
!
! !macro FinishSection SecName
! ; This macro reads section flag set by user and removes the section
! ;if it is not selected.
! ;Then it writes component installed flag to registry
! ;Input: section index constant name specified in Section command.
!
! SectionGetFlags ${${SecName}} $AR_SecFlags ;Reading section flags
! ;Checking lowest bit:
! IntOp $AR_SecFlags $AR_SecFlags & ${SF_SELECTED}
! IntCmp $AR_SecFlags 1 "leave_${SecName}"
! ;Section is not selected:
! ;Calling Section uninstall macro and writing zero installed flag
! !insertmacro "Remove_${${SecName}}"
! WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@\Components\${SecName}" \
! "Installed" 0
! Goto "exit_${SecName}"
!
! "leave_${SecName}:"
! ;Section is selected:
! WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_DIRECTORY@\Components\${SecName}" \
! "Installed" 1
!
! "exit_${SecName}:"
! !macroend
!
! !macro RemoveSection SecName
! ; This macro is used to call section's Remove_... macro
! ;from the uninstaller.
! ;Input: section index constant name specified in Section command.
!
! !insertmacro "Remove_${${SecName}}"
! !macroend
! ; Determine whether the selection of SecName changed
! !macro MaybeSelectionChanged SecName
! !insertmacro LoadVar ${SecName}_selected
! SectionGetFlags ${${SecName}} $R1
! IntOp $R1 $R1 & ${SF_SELECTED} ;Turn off all other bits
!
! ; See if the status has changed:
! IntCmp $R0 $R1 "${SecName}_unchanged"
! !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
!
! IntCmp $R1 ${SF_SELECTED} "${SecName}_was_selected"
! !insertmacro "Deselect_required_by_${SecName}"
! goto "${SecName}_unchanged"
!
! "${SecName}_was_selected:"
! !insertmacro "Select_${SecName}_depends"
!
! "${SecName}_unchanged:"
! !macroend
! ;--- End of Add/Remove macros ---
;--------------------------------
***************
*** 88,92 ****
!define MUI_HEADERIMAGE
!define MUI_ABORTWARNING
!
;--------------------------------
; path functions
--- 143,147 ----
!define MUI_HEADERIMAGE
!define MUI_ABORTWARNING
!
;--------------------------------
; path functions
***************
*** 290,294 ****
FunctionEnd
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Uninstall sutff
--- 345,348 ----
***************
*** 408,414 ****
--- 462,477 ----
;--------------------------------
+ ; Installation types
+ @CPACK_NSIS_INSTALLATION_TYPES@
+
+ ;--------------------------------
+ ; Component sections
+ @CPACK_NSIS_COMPONENT_SECTIONS@
+
+ ;--------------------------------
; Define some macro setting for the gui
@CPACK_NSIS_INSTALLER_MUI_ICON_CODE@
@CPACK_NSIS_INSTALLER_ICON_CODE@
+ @CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@
;--------------------------------
***************
*** 426,429 ****
--- 489,494 ----
!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+ @CPACK_NSIS_PAGE_COMPONENTS@
+
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_PAGE_FINISH
***************
*** 447,460 ****
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
-
;--------------------------------
;Installer Sections
! Section "Installer Section" InstSection
!
;Use the entire tree produced by the INSTALL target. Keep the
;list of directories here in sync with the RMDir commands below.
SetOutPath "$INSTDIR"
! File /r "${INST_DIR}\*.*"
;Store installation folder
--- 512,523 ----
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
;--------------------------------
;Installer Sections
! Section "-Core installation"
;Use the entire tree produced by the INSTALL target. Keep the
;list of directories here in sync with the RMDir commands below.
SetOutPath "$INSTDIR"
! @CPACK_NSIS_FULL_INSTALL@
;Store installation folder
***************
*** 475,479 ****
Push "$INSTDIR\Uninstall.exe"
Call ConditionalAddToRegisty
!
; Optional registration
Push "DisplayIcon"
--- 538,543 ----
Push "$INSTDIR\Uninstall.exe"
Call ConditionalAddToRegisty
! Push "ModifyPath"
!
; Optional registration
Push "DisplayIcon"
***************
*** 521,525 ****
SectionEnd
! Section "Add to path"
Push $INSTDIR\bin
;Read a value from an InstallOptions INI file
--- 585,589 ----
SectionEnd
! Section "-Add to path"
Push $INSTDIR\bin
;Read a value from an InstallOptions INI file
***************
*** 533,537 ****
SectionEnd
-
;--------------------------------
; Create custom pages
--- 597,600 ----
***************
*** 565,568 ****
--- 628,651 ----
done:
+
+ FunctionEnd
+
+ ;--- Add/Remove callback functions: ---
+ !macro SectionList MacroName
+ ;This macro used to perform operation on multiple sections.
+ ;List all of your components in following manner here.
+ @CPACK_NSIS_COMPONENT_SECTION_LIST@
+ !macroend
+
+ Section -FinishComponents
+ ;Removes unselected components and writes component status to registry
+ !insertmacro SectionList "FinishSection"
+ SectionEnd
+ ;--- End of Add/Remove callback functions ---
+
+ ;--------------------------------
+ ; Component dependencies
+ Function .onSelChange
+ !insertmacro SectionList MaybeSelectionChanged
FunctionEnd
***************
*** 602,605 ****
--- 685,691 ----
DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
+ ; Removes all optional components
+ !insertmacro SectionList "RemoveSection"
+
!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
***************
*** 648,650 ****
--- 734,782 ----
SectionEnd
+ ;--------------------------------
+ ; determine admin versus local install
+ ; Is install for "AllUsers" or "JustMe"?
+ ; Default to "JustMe" - set to "AllUsers" if admin or on Win9x
+ ; This function is used for the very first "custom page" of the installer.
+ ; This custom page does not show up visibly, but it executes prior to the
+ ; first visible page and sets up $INSTDIR properly...
+ ; Choose different default installation folder based on SV_ALLUSERS...
+ ; "Program Files" for AllUsers, "My Documents" for JustMe...
+
+ Function .onInit
+ ; Reads components status for registry
+ !insertmacro SectionList "InitSection"
+ StrCpy $SV_ALLUSERS "JustMe"
+ StrCpy $INSTDIR "$DOCUMENTS\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+
+ ClearErrors
+ UserInfo::GetName
+ IfErrors noLM
+ Pop $0
+ UserInfo::GetAccountType
+ Pop $1
+ StrCmp $1 "Admin" 0 +3
+ SetShellVarContext all
+ ;MessageBox MB_OK 'User "$0" is in the Admin group'
+ StrCpy $SV_ALLUSERS "AllUsers"
+ Goto done
+ StrCmp $1 "Power" 0 +3
+ SetShellVarContext all
+ ;MessageBox MB_OK 'User "$0" is in the Power Users group'
+ StrCpy $SV_ALLUSERS "AllUsers"
+ Goto done
+
+ noLM:
+ StrCpy $SV_ALLUSERS "AllUsers"
+ ;Get installation folder from registry if available
+
+ done:
+ StrCmp $SV_ALLUSERS "AllUsers" 0 +2
+ StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+
+ StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage
+ !insertmacro MUI_INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"
+
+ noOptionsPage:
+ FunctionEnd
Index: FindOpenSSL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindOpenSSL.cmake,v
retrieving revision 1.1
retrieving revision 1.1.14.1
diff -C 2 -d -r1.1 -r1.1.14.1
*** FindOpenSSL.cmake 19 Sep 2006 20:11:53 -0000 1.1
--- FindOpenSSL.cmake 25 Jun 2008 13:51:32 -0000 1.1.14.1
***************
*** 1,70 ****
! # - Try to find the OpenSSL encryption library
! # Once done this will define
! #
! # OPENSSL_FOUND - system has the OpenSSL library
! # OPENSSL_INCLUDE_DIR - the OpenSSL include directory
! # OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
!
! # Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
! #
! # Redistribution and use is allowed according to the terms of the BSD license.
! # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
!
!
! IF(OPENSSL_LIBRARIES)
! SET(OpenSSL_FIND_QUIETLY TRUE)
! ENDIF(OPENSSL_LIBRARIES)
!
! IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
! SET(LIB_FOUND 1)
! ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
!
! FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h )
!
! IF(WIN32 AND MSVC)
! # /MD and /MDd are the standard values - if somone wants to use
! # others, the libnames have to change here too
! # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
!
! FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssl ssleay32)
! FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssl ssleay32)
!
! IF(MSVC_IDE)
! IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
! SET(OPENSSL_LIBRARIES optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG})
! ELSE(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
! MESSAGE(FATAL_ERROR "Could not find the debug and release version of openssl")
! ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
! ELSE(MSVC_IDE)
! STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
! IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
! SET(OPENSSL_LIBRARIES ${SSL_EAY_DEBUG})
! ELSE(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
! SET(OPENSSL_LIBRARIES ${SSL_EAY_RELEASE})
! ENDIF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
! ENDIF(MSVC_IDE)
! MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE)
! ELSE(WIN32 AND MSVC)
!
! FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD )
!
! ENDIF(WIN32 AND MSVC)
!
! IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
! SET(OPENSSL_FOUND TRUE)
! ELSE(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
! SET(OPENSSL_FOUND FALSE)
! ENDIF (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
!
! IF (OPENSSL_FOUND)
! IF (NOT OpenSSL_FIND_QUIETLY)
! MESSAGE(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}")
! ENDIF (NOT OpenSSL_FIND_QUIETLY)
! ELSE (OPENSSL_FOUND)
! IF (OpenSSL_FIND_REQUIRED)
! MESSAGE(FATAL_ERROR "Could NOT find OpenSSL")
! ENDIF (OpenSSL_FIND_REQUIRED)
! ENDIF (OPENSSL_FOUND)
!
! MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
!
--- 1,71 ----
! # - Try to find the OpenSSL encryption library
! # Once done this will define
! #
! # OPENSSL_FOUND - system has the OpenSSL library
! # OPENSSL_INCLUDE_DIR - the OpenSSL include directory
! # OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
!
! # Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
! #
! # Redistribution and use is allowed according to the terms of the BSD license.
! # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
!
!
! IF(OPENSSL_LIBRARIES)
! SET(OpenSSL_FIND_QUIETLY TRUE)
! ENDIF(OPENSSL_LIBRARIES)
!
! IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
! SET(LIB_FOUND 1)
! ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
!
! FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h )
!
! IF(WIN32 AND MSVC)
! # /MD and /MDd are the standard values - if somone wants to use
! # others, the libnames have to change here too
! # use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
!
! FIND_LIBRARY(SSL_EAY_DEBUG NAMES ssleay32MDd ssl ssleay32)
! FIND_LIBRARY(SSL_EAY_RELEASE NAMES ssleay32MD ssl ssleay32)
!
! IF(MSVC_IDE)
! IF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
! SET(OPENSSL_LIBRARIES optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG})
! ELSE(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
! SET(OPENSSL_LIBRARIES NOTFOUND)
! MESSAGE(STATUS "Could not find the debug and release version of openssl")
! ENDIF(SSL_EAY_DEBUG AND SSL_EAY_RELEASE)
! ELSE(MSVC_IDE)
! STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
! IF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
! SET(OPENSSL_LIBRARIES ${SSL_EAY_DEBUG})
! ELSE(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
! SET(OPENSSL_LIBRARIES ${SSL_EAY_RELEASE})
! ENDIF(CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
! ENDIF(MSVC_IDE)
! MARK_AS_ADVANCED(SSL_EAY_DEBUG SSL_EAY_RELEASE)
! ELSE(WIN32 AND MSVC)
!
! FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD )
!
! ENDIF(WIN32 AND MSVC)
!
! IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
! SET(OPENSSL_FOUND TRUE)
! ELSE(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
! SET(OPENSSL_FOUND FALSE)
! ENDIF (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
!
! IF (OPENSSL_FOUND)
! IF (NOT OpenSSL_FIND_QUIETLY)
! MESSAGE(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}")
! ENDIF (NOT OpenSSL_FIND_QUIETLY)
! ELSE (OPENSSL_FOUND)
! IF (OpenSSL_FIND_REQUIRED)
! MESSAGE(FATAL_ERROR "Could NOT find OpenSSL")
! ENDIF (OpenSSL_FIND_REQUIRED)
! ENDIF (OPENSSL_FOUND)
!
! MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
!
Index: FindMatlab.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMatlab.cmake,v
retrieving revision 1.3
retrieving revision 1.3.14.1
diff -C 2 -d -r1.3 -r1.3.14.1
*** FindMatlab.cmake 15 Dec 2005 15:41:19 -0000 1.3
--- FindMatlab.cmake 25 Jun 2008 13:51:31 -0000 1.3.14.1
***************
*** 22,26 ****
SET(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/bcc54")
ELSE(${CMAKE_GENERATOR} MATCHES "Borland")
! MESSAGE(FATAL_ERROR "Generator not compatible: ${CMAKE_GENERATOR}")
ENDIF(${CMAKE_GENERATOR} MATCHES "Borland")
ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio 7")
--- 22,28 ----
SET(MATLAB_ROOT "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MathWorks\\MATLAB\\7.0;MATLABROOT]/extern/lib/win32/microsoft/bcc54")
ELSE(${CMAKE_GENERATOR} MATCHES "Borland")
! IF(MATLAB_FIND_REQUIRED)
! MESSAGE(FATAL_ERROR "Generator not compatible: ${CMAKE_GENERATOR}")
! ENDIF(MATLAB_FIND_REQUIRED)
ENDIF(${CMAKE_GENERATOR} MATCHES "Borland")
ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio 7")
Index: CPack.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.cmake,v
retrieving revision 1.35.2.2
retrieving revision 1.35.2.3
diff -C 2 -d -r1.35.2.2 -r1.35.2.3
*** CPack.cmake 21 Apr 2008 00:44:51 -0000 1.35.2.2
--- CPack.cmake 25 Jun 2008 13:51:31 -0000 1.35.2.3
***************
*** 115,118 ****
--- 115,119 ----
else(CYGWIN)
if(APPLE)
+ option(CPACK_BINARY_BUNDLE "Enable to build OSX bundles" OFF)
option(CPACK_BINARY_PACKAGEMAKER "Enable to build PackageMaker packages" ON)
option(CPACK_BINARY_OSXX11 "Enable to build OSX X11 packages" OFF)
***************
*** 132,135 ****
--- 133,137 ----
endif(UNIX)
+ cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_BUNDLE Bundle)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_PACKAGEMAKER PackageMaker)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_OSXX11 OSXX11)
***************
*** 172,176 ****
CPACK_BINARY_STGZ CPACK_BINARY_TGZ CPACK_BINARY_TBZ2
CPACK_BINARY_DEB CPACK_BINARY_RPM CPACK_BINARY_TZ
! CPACK_BINARY_NSIS CPACK_BINARY_ZIP
CPACK_SOURCE_CYGWIN CPACK_SOURCE_TBZ2 CPACK_SOURCE_TGZ
CPACK_SOURCE_TZ CPACK_SOURCE_ZIP)
--- 174,178 ----
CPACK_BINARY_STGZ CPACK_BINARY_TGZ CPACK_BINARY_TBZ2
CPACK_BINARY_DEB CPACK_BINARY_RPM CPACK_BINARY_TZ
! CPACK_BINARY_NSIS CPACK_BINARY_ZIP CPACK_BINARY_BUNDLE
CPACK_SOURCE_CYGWIN CPACK_SOURCE_TBZ2 CPACK_SOURCE_TGZ
CPACK_SOURCE_TZ CPACK_SOURCE_ZIP)
Index: FindBLAS.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindBLAS.cmake,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C 2 -d -r1.1.2.1 -r1.1.2.2
*** FindBLAS.cmake 24 Mar 2008 22:23:26 -0000 1.1.2.1
--- FindBLAS.cmake 25 Jun 2008 13:51:31 -0000 1.1.2.2
***************
*** 30,78 ****
# are generated internally and marked advanced by this macro.
! set(_libraries_work TRUE)
! set(${LIBRARIES})
! set(_combined_name)
! foreach(_library ${_list})
! set(_combined_name ${_combined_name}_${_library})
!
! if(_libraries_work)
!
! if ( WIN32 )
! find_library(${_prefix}_${_library}_LIBRARY
! NAMES ${_library}
! PATHS ENV LIB
! )
! endif ( WIN32 )
! if ( APPLE )
! find_library(${_prefix}_${_library}_LIBRARY
! NAMES ${_library}
! PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH
! )
!
! else ( APPLE )
! find_library(${_prefix}_${_library}_LIBRARY
! NAMES ${_library}
! PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
! )
! endif( APPLE )
! mark_as_advanced(${_prefix}_${_library}_LIBRARY)
! set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})
! set(_libraries_work ${${_prefix}_${_library}_LIBRARY})
endif(_libraries_work)
! endforeach(_library ${_list})
! if(_libraries_work)
! # Test this combination of libraries.
! set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}})
! #message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
! check_fortran_function_exists(${_name} ${_prefix}${_combined_name}_WORKS)
! set(CMAKE_REQUIRED_LIBRARIES)
! mark_as_advanced(${_prefix}${_combined_name}_WORKS)
! set(_libraries_work ${${_prefix}${_combined_name}_WORKS})
! endif(_libraries_work)
! if(NOT _libraries_work)
! set(${LIBRARIES} FALSE)
! endif(NOT _libraries_work)
! #message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}")
endmacro(Check_Fortran_Libraries)
--- 30,81 ----
# are generated internally and marked advanced by this macro.
! set(_libraries_work TRUE)
! set(${LIBRARIES})
! set(_combined_name)
! foreach(_library ${_list})
! set(_combined_name ${_combined_name}_${_library})
! if(_libraries_work)
!
! if ( WIN32 )
! find_library(${_prefix}_${_library}_LIBRARY
! NAMES ${_library}
! PATHS ENV LIB
! )
! endif ( WIN32 )
!
! if ( APPLE )
! find_library(${_prefix}_${_library}_LIBRARY
! NAMES ${_library}
! PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH
! )
!
! else ( APPLE )
! find_library(${_prefix}_${_library}_LIBRARY
! NAMES ${_library}
! PATHS /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH
! )
! endif( APPLE )
! mark_as_advanced(${_prefix}_${_library}_LIBRARY)
! set(${LIBRARIES} ${${LIBRARIES}} ${${_prefix}_${_library}_LIBRARY})
! set(_libraries_work ${${_prefix}_${_library}_LIBRARY})
! endif(_libraries_work)
! endforeach(_library ${_list})
! if(_libraries_work)
! # Test this combination of libraries.
! set(CMAKE_REQUIRED_LIBRARIES ${_flags} ${${LIBRARIES}})
! #message("DEBUG: CMAKE_REQUIRED_LIBRARIES = ${CMAKE_REQUIRED_LIBRARIES}")
! get_property(_LANGUAGES_ GLOBAL PROPERTY ENABLED_LANGUAGES)
! if(_LANGUAGES_ MATCHES Fortran)
! check_fortran_function_exists(${_name} ${_prefix}${_combined_name}_WORKS)
! endif(_LANGUAGES_ MATCHES Fortran)
! set(CMAKE_REQUIRED_LIBRARIES)
! mark_as_advanced(${_prefix}${_combined_name}_WORKS)
! set(_libraries_work ${${_prefix}${_combined_name}_WORKS})
endif(_libraries_work)
! if(NOT _libraries_work)
! set(${LIBRARIES} FALSE)
! endif(NOT _libraries_work)
! #message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}")
endmacro(Check_Fortran_Libraries)
***************
*** 86,95 ****
# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! cblas_dgemm
! ""
! "cblas;f77blas;atlas"
! )
endif(NOT BLAS_LIBRARIES)
--- 89,98 ----
# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! cblas_dgemm
! ""
! "cblas;f77blas;atlas"
! )
endif(NOT BLAS_LIBRARIES)
***************
*** 97,106 ****
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "sgemm;dgemm;blas"
! )
endif(NOT BLAS_LIBRARIES)
--- 100,109 ----
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "sgemm;dgemm;blas"
! )
endif(NOT BLAS_LIBRARIES)
***************
*** 108,117 ****
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "cxml"
! )
endif(NOT BLAS_LIBRARIES)
--- 111,120 ----
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "cxml"
! )
endif(NOT BLAS_LIBRARIES)
***************
*** 119,128 ****
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "dxml"
! )
endif(NOT BLAS_LIBRARIES)
--- 122,131 ----
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "dxml"
! )
endif(NOT BLAS_LIBRARIES)
***************
*** 130,139 ****
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! "-xlic_lib=sunperf"
! "sunperf;sunmath"
! )
if(BLAS_LIBRARIES)
set(BLAS_LINKER_FLAGS "-xlic_lib=sunperf")
--- 133,142 ----
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! "-xlic_lib=sunperf"
! "sunperf;sunmath"
! )
if(BLAS_LIBRARIES)
set(BLAS_LINKER_FLAGS "-xlic_lib=sunperf")
***************
*** 145,154 ****
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "scsl"
! )
endif(NOT BLAS_LIBRARIES)
--- 148,157 ----
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "scsl"
! )
endif(NOT BLAS_LIBRARIES)
***************
*** 156,165 ****
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "complib.sgimath"
! )
endif(NOT BLAS_LIBRARIES)
--- 159,168 ----
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "complib.sgimath"
! )
endif(NOT BLAS_LIBRARIES)
***************
*** 167,176 ****
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "essl;blas"
! )
endif(NOT BLAS_LIBRARIES)
--- 170,179 ----
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "essl;blas"
! )
endif(NOT BLAS_LIBRARIES)
***************
*** 180,199 ****
#BLAS in intel mkl 10 library? (em64t 64bit)
if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_intel_lp64;mkl_intel_thread;mkl_core;guide;pthread"
! )
endif(NOT BLAS_LIBRARIES)
if(NOT BLAS95_LIBRARIES)
! check_fortran_libraries(
! BLAS95_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_blas95;mkl_intel_lp64;mkl_intel_thread;mkl_core;guide;pthread"
! )
endif(NOT BLAS95_LIBRARIES)
--- 183,202 ----
#BLAS in intel mkl 10 library? (em64t 64bit)
if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_intel_lp64;mkl_intel_thread;mkl_core;guide;pthread"
! )
endif(NOT BLAS_LIBRARIES)
if(NOT BLAS95_LIBRARIES)
! check_fortran_libraries(
! BLAS95_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_blas95;mkl_intel_lp64;mkl_intel_thread;mkl_core;guide;pthread"
! )
endif(NOT BLAS95_LIBRARIES)
***************
*** 201,221 ****
if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! SGEMM
! ""
! "mkl_c_dll;mkl_intel_thread_dll;mkl_core_dll;libguide40"
! )
endif(NOT BLAS_LIBRARIES)
if(NOT BLAS95_LIBRARIES)
! check_fortran_libraries(
! BLAS95_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_blas95;mkl_intel_c;mkl_intel_thread;mkl_core;libguide40"
! )
endif(NOT BLAS95_LIBRARIES)
--- 204,224 ----
if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! SGEMM
! ""
! "mkl_c_dll;mkl_intel_thread_dll;mkl_core_dll;libguide40"
! )
endif(NOT BLAS_LIBRARIES)
if(NOT BLAS95_LIBRARIES)
! check_fortran_libraries(
! BLAS95_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_blas95;mkl_intel_c;mkl_intel_thread;mkl_core;libguide40"
! )
endif(NOT BLAS95_LIBRARIES)
***************
*** 223,233 ****
# linux 32 bit
if(NOT BLAS95_LIBRARIES)
! check_fortran_libraries(
! BLAS95_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_blas95;mkl_intel;mkl_intel_thread;mkl_core;guide;pthread"
! )
endif(NOT BLAS95_LIBRARIES)
--- 226,236 ----
# linux 32 bit
if(NOT BLAS95_LIBRARIES)
! check_fortran_libraries(
! BLAS95_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_blas95;mkl_intel;mkl_intel_thread;mkl_core;guide;pthread"
! )
endif(NOT BLAS95_LIBRARIES)
***************
*** 238,247 ****
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl;guide;pthread"
! )
endif(NOT BLAS_LIBRARIES)
--- 241,250 ----
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl;guide;pthread"
! )
endif(NOT BLAS_LIBRARIES)
***************
*** 249,270 ****
#BLAS in intel mkl library? (static, 32bit)
if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_ia32;guide;pthread"
! )
endif(NOT BLAS_LIBRARIES)
#BLAS in intel mkl library? (static, em64t 64bit)
if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_em64t;guide;pthread"
! )
endif(NOT BLAS_LIBRARIES)
--- 252,273 ----
#BLAS in intel mkl library? (static, 32bit)
if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_ia32;guide;pthread"
! )
endif(NOT BLAS_LIBRARIES)
#BLAS in intel mkl library? (static, em64t 64bit)
if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "mkl_em64t;guide;pthread"
! )
endif(NOT BLAS_LIBRARIES)
***************
*** 272,282 ****
#BLAS in acml library?
if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "acml"
! )
endif(NOT BLAS_LIBRARIES)
--- 275,285 ----
#BLAS in acml library?
if(NOT BLAS_LIBRARIES)
! check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "acml"
! )
endif(NOT BLAS_LIBRARIES)
***************
*** 284,298 ****
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! cblas_dgemm
! ""
! "Accelerate"
! )
!
! endif(NOT BLAS_LIBRARIES)
! if ( NOT BLAS_LIBRARIES )
! check_fortran_libraries(
BLAS_LIBRARIES
BLAS
--- 287,301 ----
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! cblas_dgemm
! ""
! "Accelerate"
! )
! endif(NOT BLAS_LIBRARIES)
!
! if ( NOT BLAS_LIBRARIES )
! check_fortran_libraries(
BLAS_LIBRARIES
BLAS
***************
*** 301,305 ****
"vecLib"
)
! endif ( NOT BLAS_LIBRARIES )
--- 304,308 ----
"vecLib"
)
! endif ( NOT BLAS_LIBRARIES )
***************
*** 307,316 ****
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "blas"
! )
endif(NOT BLAS_LIBRARIES)
--- 310,319 ----
if(NOT BLAS_LIBRARIES)
check_fortran_libraries(
! BLAS_LIBRARIES
! BLAS
! sgemm
! ""
! "blas"
! )
endif(NOT BLAS_LIBRARIES)
***************
*** 328,337 ****
if(BLAS_FIND_REQUIRED)
message(FATAL_ERROR
! "A required library with BLAS API not found. Please specify library location."
! )
else(BLAS_FIND_REQUIRED)
message(STATUS
! "A library with BLAS API not found. Please specify library location."
! )
endif(BLAS_FIND_REQUIRED)
endif(BLAS_FOUND)
--- 331,340 ----
if(BLAS_FIND_REQUIRED)
message(FATAL_ERROR
! "A required library with BLAS API not found. Please specify library location."
! )
else(BLAS_FIND_REQUIRED)
message(STATUS
! "A library with BLAS API not found. Please specify library location."
! )
endif(BLAS_FIND_REQUIRED)
endif(BLAS_FOUND)
Index: FindwxWidgets.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindwxWidgets.cmake,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -C 2 -d -r1.18.2.1 -r1.18.2.2
*** FindwxWidgets.cmake 21 Apr 2008 00:44:51 -0000 1.18.2.1
--- FindwxWidgets.cmake 25 Jun 2008 13:51:32 -0000 1.18.2.2
***************
*** 175,193 ****
#=====================================================================
#=====================================================================
! IF(WIN32)
! SET(WIN32_STYLE_FIND 1)
! ENDIF(WIN32)
! IF(MINGW)
! SET(WIN32_STYLE_FIND 0)
! SET(UNIX_STYLE_FIND 1)
! ENDIF(MINGW)
! IF(UNIX)
! SET(UNIX_STYLE_FIND 1)
! ENDIF(UNIX)
#=====================================================================
! # WIN32_STYLE_FIND
#=====================================================================
! IF(WIN32_STYLE_FIND)
# Useful common wx libs needed by almost all components.
SET(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
--- 175,190 ----
#=====================================================================
#=====================================================================
! IF(WIN32 AND NOT CYGWIN AND NOT MSYS)
! SET(wxWidgets_FIND_STYLE "win32")
! ELSE(WIN32 AND NOT CYGWIN AND NOT MSYS)
! IF(UNIX OR MSYS)
! SET(wxWidgets_FIND_STYLE "unix")
! ENDIF(UNIX OR MSYS)
! ENDIF(WIN32 AND NOT CYGWIN AND NOT MSYS)
#=====================================================================
! # WIN32_FIND_STYLE
#=====================================================================
! IF(wxWidgets_FIND_STYLE STREQUAL "win32")
# Useful common wx libs needed by almost all components.
SET(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
***************
*** 544,551 ****
#=====================================================================
! # UNIX_STYLE_FIND
#=====================================================================
! ELSE(WIN32_STYLE_FIND)
! IF(UNIX_STYLE_FIND)
#-----------------------------------------------------------------
# UNIX: Helper MACROS
--- 541,548 ----
#=====================================================================
! # UNIX_FIND_STYLE
#=====================================================================
! ELSE(wxWidgets_FIND_STYLE STREQUAL "win32")
! IF(wxWidgets_FIND_STYLE STREQUAL "unix")
#-----------------------------------------------------------------
# UNIX: Helper MACROS
***************
*** 573,577 ****
FOREACH(_upper_opt_name DEBUG STATIC UNICODE UNIVERSAL)
SET(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
! ENDFOREACH(_opt_name)
ENDIF(_wx_result EQUAL 0)
ENDMACRO(WX_CONFIG_SELECT_GET_DEFAULT)
--- 570,574 ----
FOREACH(_upper_opt_name DEBUG STATIC UNICODE UNIVERSAL)
SET(wxWidgets_DEFAULT_${_upper_opt_name} OFF)
! ENDFOREACH(_upper_opt_name)
ENDIF(_wx_result EQUAL 0)
ENDMACRO(WX_CONFIG_SELECT_GET_DEFAULT)
***************
*** 730,745 ****
#=====================================================================
! # Neither UNIX_STYLE_FIND, nor WIN32_STYLE_FIND
#=====================================================================
! ELSE(UNIX_STYLE_FIND)
IF(NOT wxWidgets_FIND_QUIETLY)
MESSAGE(STATUS
"${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): \n"
" Platform unknown/unsupported. It's neither WIN32 nor UNIX "
! "style find."
)
ENDIF(NOT wxWidgets_FIND_QUIETLY)
! ENDIF(UNIX_STYLE_FIND)
! ENDIF(WIN32_STYLE_FIND)
# Debug output:
--- 727,742 ----
#=====================================================================
! # Neither UNIX_FIND_STYLE, nor WIN32_FIND_STYLE
#=====================================================================
! ELSE(wxWidgets_FIND_STYLE STREQUAL "unix")
IF(NOT wxWidgets_FIND_QUIETLY)
MESSAGE(STATUS
"${CMAKE_CURRENT_LIST_FILE}(${CMAKE_CURRENT_LIST_LINE}): \n"
" Platform unknown/unsupported. It's neither WIN32 nor UNIX "
! "find style."
)
ENDIF(NOT wxWidgets_FIND_QUIETLY)
! ENDIF(wxWidgets_FIND_STYLE STREQUAL "unix")
! ENDIF(wxWidgets_FIND_STYLE STREQUAL "win32")
# Debug output:
Index: FindKDE3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindKDE3.cmake,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C 2 -d -r1.10.2.1 -r1.10.2.2
*** FindKDE3.cmake 13 Jun 2008 12:55:15 -0000 1.10.2.1
--- FindKDE3.cmake 25 Jun 2008 13:51:31 -0000 1.10.2.2
***************
*** 64,70 ****
# Author: Alexander Neundorf <neundorf at kde.org>
! IF(NOT UNIX)
MESSAGE(FATAL_ERROR "Compiling KDE3 applications and libraries under Windows is not supported")
! ENDIF(NOT UNIX)
--- 64,70 ----
# Author: Alexander Neundorf <neundorf at kde.org>
! IF(NOT UNIX AND KDE3_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Compiling KDE3 applications and libraries under Windows is not supported")
! ENDIF(NOT UNIX AND KDE3_FIND_REQUIRED)
***************
*** 73,106 ****
#this line includes FindQt.cmake, which searches the Qt library and headers
! FIND_PACKAGE(Qt3 REQUIRED)
! FIND_PACKAGE(X11 REQUIRED)
!
!
! #add some KDE specific stuff
! SET(KDE3_DEFINITIONS -DQT_CLEAN_NAMESPACE -D_GNU_SOURCE)
!
! #only on linux, but NOT e.g. on FreeBSD:
! IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
! SET (KDE3_DEFINITIONS ${KDE3_DEFINITIONS} -D_XOPEN_SOURCE=500 -D_BSD_SOURCE)
! SET ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
! SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-exceptions -fno-check-new -fno-common")
! ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
!
! # works on FreeBSD, NOT tested on NetBSD and OpenBSD
! IF (CMAKE_SYSTEM_NAME MATCHES BSD)
! SET ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
! SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
! ENDIF (CMAKE_SYSTEM_NAME MATCHES BSD)
!
! # if no special buildtype is selected, add -O2 as default optimization
! IF (NOT CMAKE_BUILD_TYPE)
! SET ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
! SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
! ENDIF (NOT CMAKE_BUILD_TYPE)
!
- #SET(CMAKE_SHARED_LINKER_FLAGS "-avoid-version -module -Wl,--no-undefined -Wl,--allow-shlib-undefined")
- #SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")
- #SET(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")
#now try to find some kde stuff
--- 73,83 ----
#this line includes FindQt.cmake, which searches the Qt library and headers
! IF(KDE3_FIND_REQUIRED)
! SET(_REQ_STRING_KDE3 "REQUIRED")
! ENDIF(KDE3_FIND_REQUIRED)
!
! FIND_PACKAGE(Qt3 ${_REQ_STRING_KDE3})
! FIND_PACKAGE(X11 ${_REQ_STRING_KDE3})
#now try to find some kde stuff
***************
*** 192,198 ****
)
- # KDE3Macros.cmake contains all the KDE specific macros
- INCLUDE(KDE3Macros)
-
#SET KDE3_FOUND
--- 169,172 ----
***************
*** 203,206 ****
--- 177,225 ----
ENDIF (KDE3_INCLUDE_DIR AND KDE3_LIB_DIR AND KDE3_DCOPIDL_EXECUTABLE AND KDE3_DCOPIDL2CPP_EXECUTABLE AND KDE3_KCFGC_EXECUTABLE)
+ # add some KDE specific stuff
+ SET(KDE3_DEFINITIONS -DQT_CLEAN_NAMESPACE -D_GNU_SOURCE)
+
+ # set compiler flags only if KDE3 has actually been found
+ IF(KDE3_FOUND)
+ SET(_KDE3_USE_FLAGS FALSE)
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+ SET(_KDE3_USE_FLAGS TRUE) # use flags for gnu compiler
+ EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} --version
+ OUTPUT_VARIABLE out)
+ # gnu gcc 2.96 does not work with flags
+ # I guess 2.95 also doesn't then
+ IF("${out}" MATCHES "2.9[56]")
+ SET(_KDE3_USE_FLAGS FALSE)
+ ENDIF("${out}" out MATCHES "2.9[56]")
+ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ #only on linux, but NOT e.g. on FreeBSD:
+ IF(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _KDE3_USE_FLAGS)
+ SET (KDE3_DEFINITIONS ${KDE3_DEFINITIONS} -D_XOPEN_SOURCE=500 -D_BSD_SOURCE)
+ SET ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+ SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-exceptions -fno-check-new -fno-common")
+ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux" AND _KDE3_USE_FLAGS)
+
+ # works on FreeBSD, NOT tested on NetBSD and OpenBSD
+ IF (CMAKE_SYSTEM_NAME MATCHES BSD AND _KDE3_USE_FLAGS)
+ SET ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+ SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
+ ENDIF (CMAKE_SYSTEM_NAME MATCHES BSD AND _KDE3_USE_FLAGS)
+
+ # if no special buildtype is selected, add -O2 as default optimization
+ IF (NOT CMAKE_BUILD_TYPE AND _KDE3_USE_FLAGS)
+ SET ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
+ SET ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+ ENDIF (NOT CMAKE_BUILD_TYPE AND _KDE3_USE_FLAGS)
+
+ #SET(CMAKE_SHARED_LINKER_FLAGS "-avoid-version -module -Wl,--no-undefined -Wl,--allow-shlib-undefined")
+ #SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")
+ #SET(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -avoid-version -Wl,--no-undefined -lc")
+ ENDIF(KDE3_FOUND)
+
+
+ # KDE3Macros.cmake contains all the KDE specific macros
+ INCLUDE(KDE3Macros)
+
MACRO (KDE3_PRINT_RESULTS)
--- NEW FILE: CPack.distribution.dist.in ---
<?xml version="1.0" encoding="UTF-8"?>
<installer-gui-script minSpecVersion="1.0">
<title>@CPACK_PACKAGE_NAME@</title>
<welcome file="@CPACK_RESOURCE_FILE_WELCOME_NOPATH@"/>
<readme file="@CPACK_RESOURCE_FILE_README_NOPATH@"/>
<license file="@CPACK_RESOURCE_FILE_LICENSE_NOPATH@"/>
<options allow-external-scripts="no" customize="allow" rootVolumeOnly="false"></options>
@CPACK_PACKAGEMAKER_CHOICES@
</installer-gui-script>
Index: FindQt3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt3.cmake,v
retrieving revision 1.16.4.1
retrieving revision 1.16.4.2
diff -C 2 -d -r1.16.4.1 -r1.16.4.2
*** FindQt3.cmake 13 Jun 2008 12:55:15 -0000 1.16.4.1
--- FindQt3.cmake 25 Jun 2008 13:51:32 -0000 1.16.4.2
***************
*** 187,191 ****
STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+$" req_qt_major_vers "${QT_MIN_VERSION}")
IF (NOT req_qt_major_vers)
! MESSAGE( FATAL_ERROR "Invalid Qt version string given: \"${QT_MIN_VERSION}\", expected e.g. \"3.1.5\"")
ENDIF (NOT req_qt_major_vers)
--- 187,191 ----
STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+$" req_qt_major_vers "${QT_MIN_VERSION}")
IF (NOT req_qt_major_vers)
! error_message( "Invalid Qt version string given: \"${QT_MIN_VERSION}\", expected e.g. \"3.1.5\"")
ENDIF (NOT req_qt_major_vers)
***************
*** 195,201 ****
# req = "6.5.4", qt = "3.2.1"
IF (req_qt_major_vers GREATER qt_major_vers) # (6 > 3) ?
! MESSAGE( FATAL_ERROR "Qt major version not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
ELSE (req_qt_major_vers GREATER qt_major_vers) # no
IF (req_qt_major_vers LESS qt_major_vers) # (6 < 3) ?
--- 195,208 ----
# req = "6.5.4", qt = "3.2.1"
+ macro(error_message msg)
+ IF(QT3_REQUIRED)
+ MESSAGE( FATAL_ERROR ${msg})
+ ELSE(QT3_REQUIRED)
+ MESSAGE( STATUS ${msg})
+ ENDIF(QT3_REQUIRED)
+ endmacro(error_message)
IF (req_qt_major_vers GREATER qt_major_vers) # (6 > 3) ?
! error_message( "Qt major version not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
ELSE (req_qt_major_vers GREATER qt_major_vers) # no
IF (req_qt_major_vers LESS qt_major_vers) # (6 < 3) ?
***************
*** 203,207 ****
ELSE (req_qt_major_vers LESS qt_major_vers) # ( 6==3) ?
IF (req_qt_minor_vers GREATER qt_minor_vers) # (5>2) ?
! MESSAGE( FATAL_ERROR "Qt minor version not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
ELSE (req_qt_minor_vers GREATER qt_minor_vers) # no
IF (req_qt_minor_vers LESS qt_minor_vers) # (5<2) ?
--- 210,214 ----
ELSE (req_qt_major_vers LESS qt_major_vers) # ( 6==3) ?
IF (req_qt_minor_vers GREATER qt_minor_vers) # (5>2) ?
! error_message( "Qt minor version not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
ELSE (req_qt_minor_vers GREATER qt_minor_vers) # no
IF (req_qt_minor_vers LESS qt_minor_vers) # (5<2) ?
***************
*** 209,213 ****
ELSE (req_qt_minor_vers LESS qt_minor_vers) # (5==2)
IF (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
! MESSAGE( FATAL_ERROR "Qt patch level not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
ELSE (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes
--- 216,220 ----
ELSE (req_qt_minor_vers LESS qt_minor_vers) # (5==2)
IF (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
! error_message( "Qt patch level not matched (required: ${QT_MIN_VERSION}, found: ${qt_version_str})") # yes
ELSE (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
SET( QT_VERSION_BIG_ENOUGH "YES" ) # yes
Index: CPack.Info.plist.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.Info.plist.in,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C 2 -d -r1.5 -r1.5.2.1
*** CPack.Info.plist.in 26 Dec 2007 21:57:13 -0000 1.5
--- CPack.Info.plist.in 25 Jun 2008 13:51:31 -0000 1.5.2.1
***************
*** 33,37 ****
<real>0.10000000149011612</real>
<key>CFBundleIdentifier</key>
! <string>com. at CPACK_PACKAGE_VENDOR@. at CPACK_PACKAGE_NAME@. at CPACK_PACKAGE_VERSION@</string>
</dict>
</plist>
--- 33,37 ----
<real>0.10000000149011612</real>
<key>CFBundleIdentifier</key>
! <string>com. at CPACK_PACKAGE_VENDOR@. at CPACK_PACKAGE_NAME@. at CPACK_PACKAGE_VERSION@@CPACK_MODULE_VERSION_SUFFIX@</string>
</dict>
</plist>
Index: FindSWIG.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindSWIG.cmake,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C 2 -d -r1.10 -r1.10.2.1
*** FindSWIG.cmake 10 Jan 2008 21:22:52 -0000 1.10
--- FindSWIG.cmake 25 Jun 2008 13:51:32 -0000 1.10.2.1
***************
*** 21,26 ****
RESULT_VARIABLE SWIG_swiglib_result)
! IF(SWIG_swiglib_result)
! MESSAGE(SEND_ERROR "Command \"${SWIG_EXECUTABLE} -swiglib\" failed with output:\n${SWIG_swiglib_error}")
ELSE(SWIG_swiglib_result)
STRING(REGEX REPLACE "[\n\r]+" ";" SWIG_swiglib_output ${SWIG_swiglib_output})
--- 21,30 ----
RESULT_VARIABLE SWIG_swiglib_result)
! IF(SWIG_swiglib_result)
! IF(SWIG_FIND_REQUIRED)
! MESSAGE(SEND_ERROR "Command \"${SWIG_EXECUTABLE} -swiglib\" failed with output:\n${SWIG_swiglib_error}")
! ELSE(SWIG_FIND_REQUIRED)
! MESSAGE(STATUS "Command \"${SWIG_EXECUTABLE} -swiglib\" failed with output:\n${SWIG_swiglib_error}")
! ENDIF(SWIG_FIND_REQUIRED)
ELSE(SWIG_swiglib_result)
STRING(REGEX REPLACE "[\n\r]+" ";" SWIG_swiglib_output ${SWIG_swiglib_output})
More information about the Cmake-commits
mailing list