[certi-cvs] certi test/utility/CMakeLists.txt CMakeLists.txt

[CERTI CVS commits]

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

Modified files:
        test/utility   : CMakeLists.txt 
        .              : CMakeLists.txt 

Log message:
        Blind fix for compiling on MacOS

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/test/utility/CMakeLists.txt?cvsroot=certi&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.99&r2=1.100

Patches:
Index: test/utility/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/test/utility/CMakeLists.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- test/utility/CMakeLists.txt 28 Mar 2010 16:08:34 -0000      1.7
+++ test/utility/CMakeLists.txt 27 Apr 2011 07:04:40 -0000      1.8
@@ -4,21 +4,20 @@
   )
 
 ADD_EXECUTABLE(CertiProcessus_A Main_SocketSHM.cc SharedStruct.hh)
-IF(WIN32)
-    TARGET_LINK_LIBRARIES(CertiProcessus_A CERTI HLA)
-ELSE(WIN32)
-    TARGET_LINK_LIBRARIES(CertiProcessus_A CERTI HLA rt)
-ENDIF(WIN32)
+
+TARGET_LINK_LIBRARIES(CertiProcessus_A CERTI HLA)
+IF(UNIX AND NOT APPLE)
+  TARGET_LINK_LIBRARIES(CertiProcessus_A rt)
+ENDIF(UNIX AND NOT APPLE)
 
 SET_TARGET_PROPERTIES(CertiProcessus_A PROPERTIES COMPILE_FLAGS -DSIDE_SC)
 
 ADD_EXECUTABLE(CertiProcessus_B Main_SocketSHM.cc SharedStruct.hh)
 
-IF(WIN32)
-    TARGET_LINK_LIBRARIES(CertiProcessus_B CERTI HLA)
-ELSE(WIN32)
-    TARGET_LINK_LIBRARIES(CertiProcessus_B CERTI HLA rt)
-ENDIF(WIN32)
+TARGET_LINK_LIBRARIES(CertiProcessus_B CERTI HLA)
+IF(UNIX AND NOT APPLE)
+    TARGET_LINK_LIBRARIES(CertiProcessus_B rt)
+ENDIF(UNIX AND NOT APPLE)
 
 SET_TARGET_PROPERTIES(CertiProcessus_B PROPERTIES COMPILE_FLAGS -DSIDE_CS)
 

Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- CMakeLists.txt      26 Apr 2011 11:07:38 -0000      1.99
+++ CMakeLists.txt      27 Apr 2011 07:04:40 -0000      1.100
@@ -147,6 +147,13 @@
 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 "")