[certi-cvs] certi CMakeLists.txt libHLA/CMakeLists.txt scri...

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      11/04/27 15:07:43

Modified files:
        .              : CMakeLists.txt 
        libHLA         : CMakeLists.txt 
        scripts        : myCERTI_env.sh.in 

Log message:
        Raw try in order to make CERTI compile on MacOS

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/certi/libHLA/CMakeLists.txt?cvsroot=certi&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/myCERTI_env.sh.in?cvsroot=certi&r1=1.1&r2=1.2

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- CMakeLists.txt      27 Apr 2011 07:04:40 -0000      1.100
+++ CMakeLists.txt      27 Apr 2011 15:07:43 -0000      1.101
@@ -1,4 +1,3 @@
-
 PROJECT(CERTI CXX)
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.4)
@@ -126,7 +125,7 @@
 
 IF(CMAKE_COMPILER_IS_GNUCXX)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmessage-length=0")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") 
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") 
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 # Enforce strict ANSI C/C++ compliance checking
@@ -147,13 +146,6 @@
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 ENDIF(NOT MINGW)
 
-# FIXME currently on MacOS we have a "undefined symbol issue"
-# The toggle to linker flag is a "quick fix" to avoid that
-# but this is not the end of the story we need to fix it for good.
-if (APPLE)
-   set(GLOBAL PROPERTY LINK_FLAGS "-flat_namespace -undefined suppress")
-endif(APPLE)
-
 IF (WIN32)
     IF (MINGW)
         SET(CMAKE_SHARED_LIBRARY_PREFIX "")
@@ -223,7 +215,9 @@
 SET(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
 SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES}")
 FIND_LIBRARY(RT_LIBRARY rt)
-SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${RT_LIBRARY})
+if(RT_LIBRARY)
+  SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${RT_LIBRARY})
+endif(RT_LIBRARY)
 
 CHECK_FUNCTION_EXISTS(clock_gettime HAVE_CLOCK_GETTIME)
 CHECK_FUNCTION_EXISTS(clock_settime HAVE_CLOCK_SETTIME)
@@ -375,6 +369,20 @@
 # Globally used compiler flags
 ADD_DEFINITIONS(-DRTI_USES_STD_FSTREAM)
 
+# FIXME currently on MacOS we have a "undefined symbol issue"
+# The toggle to linker flag is a "quick fix" to avoid that
+# but this is not the end of the story we need to fix it for good.
+if (APPLE)
+   SET (CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS_INIT} 
"-flat_namespace -undefined suppress"
+        CACHE STRING "Flags used by the linker during the creation of dll's." 
FORCE)
+   # module linker flags
+   SET (CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS_INIT} 
"-flat_namespace -undefined suppress"
+        CACHE STRING "Flags used by the linker during the creation of 
modules." FORCE)
+
+   #set(PROPERTY LINK_FLAGS_DEBUG "-flat_namespace -undefined suppress")
+Endif(APPLE)
+
+
 ADD_SUBDIRECTORY( include )
 ADD_SUBDIRECTORY( libHLA )
 ADD_SUBDIRECTORY( libCERTI )

Index: libHLA/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libHLA/CMakeLists.txt,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- libHLA/CMakeLists.txt       3 Nov 2010 22:17:44 -0000       1.13
+++ libHLA/CMakeLists.txt       27 Apr 2011 15:07:43 -0000      1.14
@@ -111,7 +111,9 @@
 )
 
 IF (HAVE_POSIX_CLOCK)
+    IF(RT_LIBRARY)
     TARGET_LINK_LIBRARIES(HLA ${RT_LIBRARY})
+    ENDIF(RT_LIBRARY)
 ENDIF (HAVE_POSIX_CLOCK)
 
 SET_TARGET_PROPERTIES(HLA PROPERTIES PROJECT_LABEL LibHLA)

Index: scripts/myCERTI_env.sh.in
===================================================================
RCS file: /sources/certi/certi/scripts/myCERTI_env.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- scripts/myCERTI_env.sh.in   24 Jun 2010 13:19:16 -0000      1.1
+++ scripts/myCERTI_env.sh.in   27 Apr 2011 15:07:43 -0000      1.2
@@ -72,6 +72,11 @@
 then
     export LD_LIBRARY_PATH=$MOREPATHLIB:$LD_LIBRARY_PATH
 fi
+MODIFPATHMACOS=`echo $DYLD_LIBRARY_PATH | grep $MOREPATHLIB`
+if [ -z "$MODIFPATH" ];
+then
+    export DYLD_LIBRARY_PATH=$MOREPATHLIB:$DYLD_LIBRARY_PATH
+fi
 
 echo "=========================================================="
 echo "** WARNING ** We hope you have made source myCERTI.sh **"
@@ -82,5 +87,6 @@
 echo "CERTI_FED       = " $CERTI_FED
 echo "PATH            = " $PATH
 echo "LD_LIBRARY_PATH = " $LD_LIBRARY_PATH
+echo "DYLD_LIBRARY_PATH = " $DYLD_LIBRARY_PATH