Add Calcium for OSX

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b19bb1384fec1ac9cb780903e99c83a435658f1d..54d02e86b05a285447ec73f0ba2250720b6eda7e 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,6 +128,11 @@ endif(SALOME_USE_DOC)
 
 INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/SalomeMacros.cmake)
 
+SET(CALCIUM_IDL_INT_F77 long)
+SET(CALCIUM_CORBA_INT_F77 CORBA::Long)
+SET(LONG_OR_INT int)
+
+
 SET(KERNEL_salomebin_BINS bin/salome)
 
 SET(KERNEL_salomelib_LIBS lib/salome)

diff --git a/salome_adm/cmake_files/FindOMNIORB.cmake b/salome_adm/cmake_files/FindOMNIORB.cmake
index 08ae0bf0ecbf67849a7d5ef9f16c6833e39cdd6b..c638db9defdab56ddd801b89e5c947ce3a2a0e5b 100644 (file)
--- a/salome_adm/cmake_files/FindOMNIORB.cmake
+++ b/salome_adm/cmake_files/FindOMNIORB.cmake
@@ -206,8 +206,8 @@ ENDIF (WIN32)
 ##############################################################################
 FIND_PATH( OMNIORB_PYTHON_BACKEND
   NAMES python.py
-  PATHS $ENV{OMNIORB_DIR}/lib/python${PYTHON_VERSION}/site-packages/omniidl_be $ENV{OMNIORBPY_DIR}/lib/python${PYTHON_VERSION}/site-packages/omniidl_be
-        ${OMNIORB_DIR}/lib/python${PYTHON_VERSION}/site-packages/omniidl_be ${OMNIORBPY_DIR}/lib/python${PYTHON_VERSION}/site-packages/omniidl_be
+  PATHS $ENV{OMNIORB_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/omniidl_be $ENV{OMNIORBPY_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/omniidl_be
+        ${OMNIORB_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/omniidl_be ${OMNIORBPY_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/omniidl_be
   DOC "Path to python-backend directory (omniidl_be) including python.py file"
   NO_DEFAULT_PATH )
 
@@ -270,7 +270,6 @@ if(OMNIORB_INCLUDE_DIR AND
   SET(OMNIORB_IDLPYFLAGS -bpython)
   IF (OMNIORB_PYTHON_BACKEND) 
     SET(OMNIORB_IDLPYFLAGS "-p ${OMNIORB_PYTHON_BACKEND} ${OMNIORB_IDLPYFLAGS}")
-    MESSAGE("Backend python for omniidl: " ${OMNIORB_IDLPYFLAGS})
   ENDIF(OMNIORB_PYTHON_BACKEND)
   SET(IDLCXXFLAGS ${OMNIORB_IDLCXXFLAGS})
   SET(IDLPYFLAGS ${OMNIORB_IDLPYFLAGS})
@@ -284,6 +283,7 @@ if(OMNIORB_INCLUDE_DIR AND
     SET(OMNIORB_DEFINITIONS "${OMNIORB_DEFINITIONS} -D__macos__")#for omnithread.h to be checked...
   ENDIF(APPLE)
 
+
 else()
   message(FATAL_ERROR "OmniORB is required, please define OMNIORB_DIR as environment or cmake variable")
 endif()

diff --git a/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt b/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt
index 2f6d9838a47fbfdf28c1e96f71584a521f8c2609..c2633e635f883c9081ae0edb440e13b5fbed5f0e 100755 (executable)
--- a/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt
+++ b/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt
@@ -64,6 +64,7 @@ SET(CalciumC_SOURCES
   calciumf.c
 )
 ADD_LIBRARY(CalciumC ${CalciumC_SOURCES})
+TARGET_LINK_LIBRARIES(CalciumC SalomeDSCSuperv SalomeCalcium)
 
 INSTALL(TARGETS CalciumC DESTINATION ${KERNEL_salomelib_LIBS})
 

diff --git a/src/DSC/DSC_User/Datastream/Calcium/fortoc.h b/src/DSC/DSC_User/Datastream/Calcium/fortoc.h
index 479048adacb6772b87251ee891763ae71b1a50db..c8195211ff4d945e4375652884e5f406acd04585 100644 (file)
--- a/src/DSC/DSC_User/Datastream/Calcium/fortoc.h
+++ b/src/DSC/DSC_User/Datastream/Calcium/fortoc.h
@@ -23,7 +23,7 @@
 /* Operateur de concatenation */
 #define  _(A,B)   A##B
 
-#ifdef  __linux
+#if defined __linux || defined  __APPLE__
 #define F_FUNC(lname,uname) _(lname,_)        /* Fortran function name */
 #define F_CALL(lname,uname) _(lname,_)        /* Fortran function call */
 #define STR_PSTR(str)       char *str         /* fortran string arg pointer */