[SCM] OCE packaging branch, upstream, updated. OCE-0.6.0-230-g17bea23
davyw
davy.wouters at gmail.com
Fri Feb 24 18:50:50 UTC 2012
The following commit has been merged in the upstream branch:
commit 9c413090539903003944a095bcd13b99c0e448c2
Author: davyw <davy.wouters at gmail.com>
Date: Tue Jan 17 22:36:41 2012 +0100
Moved bcc32 specific scripts for TKService and TKOpenGl to their own CMakeLists.txt.
diff --git a/adm/cmake/BuildToolkit.cmake b/adm/cmake/BuildToolkit.cmake
index f4f5d68..d214fe9 100644
--- a/adm/cmake/BuildToolkit.cmake
+++ b/adm/cmake/BuildToolkit.cmake
@@ -93,37 +93,6 @@ ENDIF(${PROJECT_NAME}_COMPILER_SUPPORTS_PCH AND ${PROJECT_NAME}_USE_PCH)
ADD_LIBRARY(${TOOLKIT} ${${PROJECT_NAME}_LIBRARY_TYPE} ${TOOLKIT_SOURCE_FILES} ${TOOLKIT_RESOURCES} )
-IF(BORLAND)
- # cgmobin.c needs __STDC__=1 define in order to build for bcc32.
- IF(TOOLKIT STREQUAL "TKService")
- foreach(source_file ${TOOLKIT_SOURCE_FILES} )
- if ((source_file MATCHES "cgmobin.c") OR
- (source_file MATCHES "cgmochar.c") OR
- (source_file MATCHES "cgmotext.c"))
- set_source_files_properties("${source_file}" PROPERTIES COMPILE_DEFINITIONS "__STDC__=1")
- endif()
- endforeach(source_file)
- ENDIF()
-ENDIF(BORLAND)
-
-IF(BORLAND AND BORLAND_VERSION_RS_XE2)
- # For bcc32 compiler v6.40 and up -x- compiler option must be passed as a compiler option
- # in stead of #pragma option -x- in code.
- IF(TOOLKIT STREQUAL "TKOpenGl")
- foreach(source_file ${TOOLKIT_SOURCE_FILES} )
- if((source_file MATCHES "OpenGl_attri.cxx") OR
- (source_file MATCHES "OpenGl_depthcue.cxx") OR
- (source_file MATCHES "OpenGl_pick.cxx") OR
- (source_file MATCHES "OpenGl_telem_util.cxx") OR
- (source_file MATCHES "OpenGl_undefined.cxx") OR
- (source_file MATCHES "OpenGl_view.cxx"))
- MESSAGE(STATUS "(bcc32) Disabling exceptions for ${source_file}.")
- set_source_files_properties("${source_file}" PROPERTIES COMPILE_FLAGS "-x-")
- endif()
- endforeach(source_file)
- ENDIF()
-ENDIF(BORLAND AND BORLAND_VERSION_RS_XE2)
-
# TODO Add current toolkit header files into a source group?
# Add target specific locations of *.lxx and *.ixx files
IF(NOT ${PROJECT_NAME}_NO_LIBRARY_VERSION)
diff --git a/adm/cmake/TKOpenGl/CMakeLists.txt b/adm/cmake/TKOpenGl/CMakeLists.txt
index 1ad42eb..aed0f9f 100644
--- a/adm/cmake/TKOpenGl/CMakeLists.txt
+++ b/adm/cmake/TKOpenGl/CMakeLists.txt
@@ -38,3 +38,18 @@ ENDIF()
INCLUDE(../BuildToolkit.cmake)
+IF(BORLAND AND BORLAND_VERSION_RS_XE2)
+ # For bcc32 compiler v6.40 and up -x- compiler option must be passed as a compiler option
+ # in stead of #pragma option -x- in code.
+ foreach(source_file ${TOOLKIT_SOURCE_FILES} )
+ if((source_file MATCHES "OpenGl_attri.cxx") OR
+ (source_file MATCHES "OpenGl_depthcue.cxx") OR
+ (source_file MATCHES "OpenGl_pick.cxx") OR
+ (source_file MATCHES "OpenGl_telem_util.cxx") OR
+ (source_file MATCHES "OpenGl_undefined.cxx") OR
+ (source_file MATCHES "OpenGl_view.cxx"))
+ MESSAGE(STATUS "(bcc32) Disabling exceptions for ${source_file}.")
+ set_source_files_properties("${source_file}" PROPERTIES COMPILE_FLAGS "-x-")
+ endif()
+ endforeach(source_file)
+ENDIF(BORLAND AND BORLAND_VERSION_RS_XE2)
diff --git a/adm/cmake/TKService/CMakeLists.txt b/adm/cmake/TKService/CMakeLists.txt
index 0522738..aba641e 100644
--- a/adm/cmake/TKService/CMakeLists.txt
+++ b/adm/cmake/TKService/CMakeLists.txt
@@ -41,3 +41,13 @@ ENDIF(FREEIMAGE_LIBRARY AND ${PROJECT_NAME}_WITH_FREEIMAGE)
INCLUDE(../BuildToolkit.cmake)
+IF(BORLAND)
+ # cgmobin.c, cgmochar.c and cgmotext.c need __STDC__=1 define in order to build for bcc32.
+ foreach(source_file ${TOOLKIT_SOURCE_FILES} )
+ if ((source_file MATCHES "cgmobin.c") OR
+ (source_file MATCHES "cgmochar.c") OR
+ (source_file MATCHES "cgmotext.c"))
+ set_source_files_properties("${source_file}" PROPERTIES COMPILE_DEFINITIONS "__STDC__=1")
+ endif()
+ endforeach(source_file)
+ENDIF(BORLAND)
--
OCE packaging
More information about the debian-science-commits
mailing list