turn on dynamic graph as default in CMakeList

jegonzal · Jun 21, 2013 · 3a1ab23 · 3a1ab23
1 parent 4fb815e
commit 3a1ab23
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ demoapps/pagerank/matlab_tools/*.tsv
 tags
 *swp
 \.mchg\.mchg
+.ycm_extra_conf*
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,9 +30,9 @@ include_directories(
   ${GraphLab_SOURCE_DIR}/deps/local/include)
 
 # set link path
-link_directories(${GraphLab_SOURCE_DIR}/deps/local/lib)
+ link_directories(${GraphLab_SOURCE_DIR}/deps/local/lib)
 
-#add_definitions(-DUSE_DYNAMIC_LOCAL_GRAPH)
+add_definitions(-DUSE_DYNAMIC_LOCAL_GRAPH)
 #add_definitions(-DDEBUG_GRAPH)
 #add_definitions(-DOUTPUTLEVEL=1)
 
@@ -475,10 +475,9 @@ endif()
 
 # MPI =========================================================================
 # MPI is currently used to establish communication between rpc nodes
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "/Users/haijieg/mylibs/")
 if(NOT NO_MPI)
   #find_package(MPICH2)
-  find_package(MPI)
+  find_package(MPI) 
 endif()
 
 if(MPI_FOUND)
@@ -518,9 +517,8 @@ macro(requires_core_deps NAME)
     tcmalloc
     event event_pthreads
     zookeeper_mt
-    # qthread
     json)
-  add_dependencies(${NAME} boost libevent libjson zookeeper libtcmalloc) #qthreads libtcmalloc 
+  add_dependencies(${NAME} boost libevent libjson zookeeper libtcmalloc)
   if(MPI_FOUND)
     target_link_libraries(${NAME} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARY})
   endif(MPI_FOUND)
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,3 +24,4 @@ demoapps/pagerank/matlab_tools/*.tsv @@
     tags
     *swp
     \.mchg\.mchg
+    .ycm_extra_conf*