MacOS support

zhangce · Oct 4, 2013 · a7e8697 · a7e8697
1 parent d384d43
commit a7e8697
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/elementary/CMakeLists.txt b/elementary/CMakeLists.txt
@@ -34,16 +34,24 @@ if(NOT WITHTHRIFT)
   ####TEST####
   message(STATUS "Build without THRIFT SUPPORT")
 
-  add_executable(ele_test src/fg/modelaccessor.cpp src/fg/variable.cpp src/fg/factoraccessor.cpp src/io/varlenkv.cpp src/io/fixlenkv.cpp src/fg/variablescanner.cpp src/fg/factorgraph.cpp src/io/buffer.cpp src/io/driver_file.cpp src/io/frame.cpp src/io/scanner.cpp test/test.cpp)
+  add_executable(ele_test src/fg/modelaccessor.cpp src/fg/variable.cpp src/fg/factoraccessor.cpp src/io/varlenkv.cpp src/io/fixlenkv.cpp src/fg/variablescanner.cpp src/fg/factorgraph.cpp src/io/buffer.cpp src/io/driver_file.cpp src/io/frame.cpp src/io/scanner.cpp test/test.cpp src/common/timer.cpp)
   target_link_libraries(ele_test gtest gtest_main)
   add_test(test ele_test)
-  target_link_libraries(ele_test -lrt)
+
+  IF(APPLE)
+      #target_link_libraries(ele_test -lrt)
+  ELSE()
+      target_link_libraries(ele_test -lrt)
+  ENDIF()
 
   ######MAIN ENTRY######
   find_package (Threads)
-  add_executable(ele src/main.cpp src/fg/modelaccessor.cpp src/fg/variable.cpp src/fg/factoraccessor.cpp src/io/varlenkv.cpp src/io/fixlenkv.cpp src/fg/variablescanner.cpp src/fg/factorgraph.cpp src/io/buffer.cpp src/io/driver_file.cpp src/io/frame.cpp src/io/scanner.cpp)
+  add_executable(ele src/main.cpp src/fg/modelaccessor.cpp src/fg/variable.cpp src/fg/factoraccessor.cpp src/io/varlenkv.cpp src/io/fixlenkv.cpp src/fg/variablescanner.cpp src/fg/factorgraph.cpp src/io/buffer.cpp src/io/driver_file.cpp src/io/frame.cpp src/io/scanner.cpp src/common/timer.cpp)
   target_link_libraries(ele ${CMAKE_THREAD_LIBS_INIT})
+
+  IF(NOT APPLE)
   target_link_libraries(ele -lrt)
+  ENDIF()
 
 else()
 
@@ -66,17 +74,24 @@ else()
 
   ####TEST####
   include_directories("${Thrift_INCLUDE_DIR}")
-  add_executable(ele_test src/io/hbase/Hbase.cpp src/io/hbase/hbase_constants.cpp src/io/hbase/hbase_types.cpp src/io/driver_hbase.cpp src/fg/modelaccessor.cpp src/fg/variable.cpp src/fg/factoraccessor.cpp src/io/varlenkv.cpp src/io/fixlenkv.cpp src/fg/variablescanner.cpp src/fg/factorgraph.cpp src/io/buffer.cpp src/io/driver_file.cpp src/io/frame.cpp src/io/scanner.cpp test/test.cpp)
+  add_executable(ele_test src/io/hbase/Hbase.cpp src/io/hbase/hbase_constants.cpp src/io/hbase/hbase_types.cpp src/io/driver_hbase.cpp src/fg/modelaccessor.cpp src/fg/variable.cpp src/fg/factoraccessor.cpp src/io/varlenkv.cpp src/io/fixlenkv.cpp src/fg/variablescanner.cpp src/fg/factorgraph.cpp src/io/buffer.cpp src/io/driver_file.cpp src/io/frame.cpp src/io/scanner.cpp test/test.cpp src/common/timer.cpp)
   add_test(test ele_test)
+
+  IF(NOT APPLE)
   target_link_libraries(ele_test -lrt)
+  ENDIF()
+
   target_link_libraries(ele_test gtest gtest_main) 
   target_link_libraries (ele_test "-L${Thrift_LIB} -lthrift")
 
   ######MAIN ENTRY######
   find_package (Threads)
   add_executable(ele src/main.cpp)
   target_link_libraries(ele ${CMAKE_THREAD_LIBS_INIT})
+
+  IF(NOT APPLE)
   target_link_libraries(ele -lrt)
+  ENDIF()
 
 endif()
 

diff --git a/elementary/test/.DS_Store b/elementary/test/.DS_Store
diff --git a/elementary/test/prepare/lda/__init__.pyc b/elementary/test/prepare/lda/__init__.pyc
diff --git a/elementary/test/prepare/lda/main.pyc b/elementary/test/prepare/lda/main.pyc
diff --git a/elementary/test/test.cpp b/elementary/test/test.cpp
@@ -5,7 +5,6 @@
 
 #include "fg/test_factorgraph.h"
 
-/*
 #include "io/test_frame.h"
 #include "fg/test_variablescanner.h"
 
@@ -18,7 +17,6 @@
 #include "fg/test_factoraccessor.h"
 #include "io/test_scanner.h"
 #include "fg/test_modelaccessor.h"
-*/
 
 #ifdef WITHTHRIFT
 #include "io/test_driver_hbase.h"