[SCM] OCE packaging branch, upstream, updated. OCE-0.6.0-230-g17bea23
Denis Barbier
bouzim at gmail.com
Fri Feb 24 18:50:57 UTC 2012
The following commit has been merged in the upstream branch:
commit e09e51a22ab8b9547b12f6277ed347339380ef1c
Merge: a54c1053e78d20dd1a21b82b9f6690ee6adf0d17 9c413090539903003944a095bcd13b99c0e448c2
Author: Denis Barbier <bouzim at gmail.com>
Date: Fri Jan 20 11:57:25 2012 -0800
Merge pull request #234 from tpaviot/review/embarcadero
Review/embarcadero
diff --combined CMakeLists.txt
index a6dd0fc,95ff37e..23d8275
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -73,6 -73,10 +73,10 @@@ IF(MSVC
OPTION_WITH_DEFAULT( ${PROJECT_NAME}_USE_BUNDLE "Use OCE Windows Bundle" OFF )
ENDIF(MSVC)
+ IF(BORLAND)
+ OPTION_WITH_DEFAULT( ${PROJECT_NAME}_INSTALL_TDS_FILES "Instal TDS files (debug informations)" ON )
+ ENDIF(BORLAND)
+
IF(${PROJECT_NAME}_USE_BUNDLE)
OPTION_WITH_DEFAULT( ${PROJECT_NAME}_BUNDLE_AUTOINSTALL "Autoinstall bundle DLLs" ON )
MARK_AS_ADVANCED(${PROJECT_NAME}_BUNDLE_AUTOINSTALL)
@@@ -115,11 -119,11 +119,11 @@@ MARK_AS_ADVANCED(${PROJECT_NAME}_RPATH_
# In MSVC it is not desirable to have it ON by default, since users must
# compile/use the OCE debug libraries to build it's own programs in DEBUG mode.
# DEB should be enabled by developers only, in this case
- IF (MSVC AND CMAKE_CONFIGURATION_TYPES)
+ IF ((MSVC OR BORLAND) AND CMAKE_CONFIGURATION_TYPES)
SET (DEB_DEFAULT "OFF")
ELSE ()
SET (DEB_DEFAULT "ON")
- ENDIF (MSVC AND CMAKE_CONFIGURATION_TYPES)
+ ENDIF ((MSVC OR BORLAND) AND CMAKE_CONFIGURATION_TYPES)
OPTION_WITH_DEFAULT( ${PROJECT_NAME}_ENABLE_DEB_FLAG "Enables DEB define in debug configuration" ${DEB_DEFAULT} )
MARK_AS_ADVANCED(${PROJECT_NAME}_ENABLE_DEB_FLAG)
@@@ -184,7 -188,7 +188,7 @@@ SET_DIRECTORY_PROPERTIES(PROPERTIES COM
SET_DIRECTORY_PROPERTIES(PROPERTIES COMPILE_DEFINITIONS_RELWITHDEBINFO NDEBUG)
IF(${PROJECT_NAME}_ENABLE_DEB_FLAG)
- SET_DIRECTORY_PROPERTIES(PROPERTIES COMPILE_DEFINITIONS_DEBUG "DEB;_DEBUG")
+ SET_DIRECTORY_PROPERTIES(PROPERTIES COMPILE_DEFINITIONS_DEBUG "DEB=1;_DEBUG")
ELSE ()
SET_DIRECTORY_PROPERTIES(PROPERTIES COMPILE_DEFINITIONS_DEBUG "_DEBUG")
ENDIF (${PROJECT_NAME}_ENABLE_DEB_FLAG)
@@@ -635,6 -639,65 +639,65 @@@ IF (NOT WIN32
ENDIF(NOT WIN32)
#######################################################
+ # Check compiler version - Determine Borland compiler #
+ #######################################################
+ IF(BORLAND AND NOT BORLAND_VERSION)
+ IF(EXISTS ${CMAKE_CXX_COMPILER})
+ EXECUTE_PROCESS(
+ COMMAND ${CMAKE_CXX_COMPILER} /?
+ OUTPUT_VARIABLE _output
+ ERROR_QUIET
+ )
+
+ string(REGEX MATCH "Embarcadero C[+][+] [0-9]+.[0-9]+"
+ _borland_version "${_output}")
+
+ if(_borland_version)
+ string(REGEX MATCHALL "[0-9]+" _borland_version_list "${_borland_version}")
+ list(GET _borland_version_list 0 _borland_major)
+ list(GET _borland_version_list 1 _borland_minor)
+ else()
+ string(REGEX MATCH "Borland C[+][+] [0-9]+].[0-9]+"
+ _borland_version "${_output}")
+
+ if(_borland_version)
+ string(REGEX MATCHALL "[0-9]+" _borland_version_list "${_borland_version}")
+ list(GET _borland_version_list 0 _borland_major)
+ list(GET _borland_version_list 1 _borland_minor)
+ endif()
+ endif()
+
+ # XE2 compiler?
+ if("v${_borland_major}.${_borland_minor}" STREQUAL "v6.41")
+ SET(BORLAND_VERSION "bcc32 v6.41 (RS XE2)")
+ SET(BORLAND_VERSION_RS_XE2 1)
+ # XE compiler?
+ elseif("v${_borland_major}.${_borland_minor}" STREQUAL "v6.30")
+ SET(BORLAND_VERSION "bcc32 v6.30 (RS XE)")
+ SET(BORLAND_VERSION_RS_XE 1)
+ # 2010 compiler?
+ elseif("v${_borland_major}.${_borland_minor}" STREQUAL "v6.20")
+ SET(BORLAND_VERSION "bcc32 v6.20 (RS 2010)")
+ SET(BORLAND_VERSION_RS_2010 1)
+ # TODO: 2009 compiler?
+ # TODO: 2007 compiler?
+ # 2006 compiler?
+ elseif("v${_borland_major}.${_borland_minor}" STREQUAL "v5.82")
+ SET(BORLAND_VERSION "bcc32 v5.82 (BDS 2006)")
+ SET(BORLAND_VERSION_BDS_2006 1)
+ #TODO: Older compilers?
+ else()
+ SET(BORLAND_VERSION "Unknown")
+ endif()
+
+ UNSET(_output)
+ UNSET(_borland_version)
+ UNSET(_borland_major)
+ UNSET(_borland_minor)
+ ENDIF()
+ ENDIF()
+
+ #######################################################
# Check platforms - Define specific compilation flags #
#######################################################
IF(UNIX)
@@@ -653,6 -716,11 +716,11 @@@ ELSE(UNIX
######### Windows ###########
MESSAGE(STATUS "Windows system detected")
ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB -DHAVE_CONFIG_H )
+ ######### Borland ###########
+ IF(BORLAND)
+ MESSAGE(STATUS "Borland compiler detected: ${BORLAND_VERSION}")
+ ADD_DEFINITIONS(-DHAVE_IOS )
+ ENDIF(BORLAND)
SET(PLATFORM win)
ELSE(WIN32)
MESSAGE(STATUS "Unknown platform")
@@@ -686,9 -754,11 +754,11 @@@ IF(WIN32
IF(MSVC) # The compiler used is MSVC
MESSAGE(STATUS "Found MSVC compiler: ${MSVC} ${MSVC_VERSION}")
SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin/)
- ELSE(MSVC)
+ ELSEIF (BORLAND) # The compiler used is BORLAND
+ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/win${BIT}/bin/${CMAKE_BUILD_TYPE})
+ ELSE()
SET(LIBRARY_OUTPUT_PATH win${BIT}/bin/${CMAKE_BUILD_TYPE})
- ENDIF(MSVC)
+ ENDIF()
SET(EXECUTABLE_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH})
ELSE(WIN32)
SET(LIBRARY_OUTPUT_PATH ${PLATFORM}/${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_BUILD_TYPE}-${BIT})
@@@ -1144,15 -1214,3 +1214,15 @@@ if( CPACK_GENERATOR MATCHES ".*RPM.*"
endif()
INCLUDE(CPack)
+
+########################################################################################
+# Uninstall code #
+# From http://www.cmake.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F #
+# ######################################################################################
+configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+ IMMEDIATE @ONLY)
+
+add_custom_target(uninstall
+ COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
--
OCE packaging
More information about the debian-science-commits
mailing list