Update FindCPLEX and cplex-shared to deal with the two different osx …

…installers (yielding in x86_64_darwin or _osx paths), and to successfully link the shared libcplex against libstdc++
janelia-flyem · Feb 21, 2014 · e4908e4 · e4908e4
1 parent 31e3832
commit e4908e4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/FindCplex.cmake b/FindCplex.cmake
@@ -89,6 +89,7 @@ FIND_LIBRARY(CPLEX_LIBRARY
         ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_debian4.0_4.1/static_pic #unix
         ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_sles10_4.1/static_pic #unix 
         ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_osx/static_pic #osx 
+        ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_darwin/static_pic #osx 
   PATHS ENV LIBRARY_PATH #unix
         ENV LD_LIBRARY_PATH #unix
   )
@@ -100,6 +101,7 @@ FIND_LIBRARY(CPLEX_ILOCPLEX_LIBRARY
         ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_debian4.0_4.1/static_pic #unix 
         ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_sles10_4.1/static_pic #unix 
         ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_osx/static_pic #osx 
+        ${CPLEX_ROOT_DIR}/cplex/lib/x86-64_darwin/static_pic #osx 
   PATHS ENV LIBRARY_PATH
         ENV LD_LIBRARY_PATH
   )
@@ -111,6 +113,7 @@ FIND_LIBRARY(CPLEX_CONCERT_LIBRARY
         ${CPLEX_ROOT_DIR}/concert/lib/x86-64_debian4.0_4.1/static_pic #unix 
         ${CPLEX_ROOT_DIR}/concert/lib/x86-64_sles10_4.1/static_pic #unix 
         ${CPLEX_ROOT_DIR}/concert/lib/x86-64_osx/static_pic #osx 
+        ${CPLEX_ROOT_DIR}/concert/lib/x86-64_darwin/static_pic #osx 
   PATHS ENV LIBRARY_PATH
         ENV LD_LIBRARY_PATH
   )
@@ -127,6 +130,7 @@ else()
           HINTS ${CPLEX_ROOT_DIR}/cplex/bin/x86-64_sles10_4.1 #unix 
                 ${CPLEX_ROOT_DIR}/cplex/bin/x86-64_debian4.0_4.1 #unix 
                 ${CPLEX_ROOT_DIR}/cplex/bin/x86-64_osx #osx 
+        	${CPLEX_ROOT_DIR}/cplex/bin/x86-64_darwin #osx 
 	  ENV LIBRARY_PATH
           ENV LD_LIBRARY_PATH
 	  )

diff --git a/cplex-shared.cmake b/cplex-shared.cmake
@@ -27,7 +27,7 @@ find_package( Cplex REQUIRED )
 if (APPLE)
     set(SHARED_CPLEX_COMPILE_FLAGS "-fpic -stdlib=libstdc++")
     set(SHARED_CPLEX_LINK_FLAGS_1 "-Wl,-all_load")
-    set(SHARED_CPLEX_LINK_FLAGS_2 "")
+    set(SHARED_CPLEX_LINK_FLAGS_2 "-stdlib=libstdc++")
 else()
     set(SHARED_CPLEX_COMPILE_FLAGS "-shared -fpic")
     set(SHARED_CPLEX_LINK_FLAGS_1 "-Wl,-whole-archive")