fixed some depenency issues. looking into why linker cant always find…

… libs.

.gitignore

@@ -1,9 +1,10 @@
+CTestTest*.cmake
 tests/ctl_test
 dependencies/ann
 dependencies/gtest
 dependencies/metis
 dependencies/boost
-
+dependencies/tbb
 **/test_multi
 deps/gtest
 deps/CMakeFiles

build_dependencies.txt

@@ -10,14 +10,48 @@
 #  This installs this the specified dependency for the user in dependencies
 
 
-#If providing BOOST comment out the line below 
-set(Boost_Found 0)
-#and uncomment these lines
-set(Boost_FOUND 1)
-set(Boost_INCLUDE_DIR ${CTL_DEPS}/boost/include)
-set(Boost_LIBRARY_DIR ${CTL_DEPS}/boost/lib)
-set(Boost_LIBRARIES program_options boost_mpi serialization) 
+#If providing BOOST uncomment out the line below s
+#set(Boost_Found 1) 
+#set(Boost_INCLUDE_DIR ${CTL_DEPS}/boost/include)
+#set(Boost_LIBRARY_DIR ${CTL_DEPS}/boost/lib)
+#set(Boost_LIBRARIES libboost_program_options.so libboost_mpi.so libboost_serialization.so) 
+#include_directories( ${Boost_INCLUDE_DIR})
+#link_directories( ${Boost_LIBRARY_DIR})
+
+#If providing TBB uncomment out the line belows
+#set(TBB_FOUND 1) 
+#set(TBB_INCLUDE_DIR ${CTL_DEPS}/tbb/include)
+#set(TBB_DEBUG_LIBDIR)
+#set(TBB_RELEASE_LIBDIR)
+#set(TBB_LIBRARY_DIR  ${CTL_DEPS}/tbb/build/${TBB_DEBUG_LIBDIR}
+#                     ${CTL_DEPS}/tbb/build/${TBB_RELEASE_LIBDIR})
+#set(TBB_LIBRARIES libtbb.so libtbbmalloc.so) 
+#include_directories(${TBB_INCLUDE_DIR})
+#link_directories(${TBB_LIBRARY_DIR})
+
+#If providing ANN comment out the lines below
+#set(ANN_FOUND 1)
+#set(ANN_INCLUDE_DIR ${CTL_DEPS}/ann/include)
+#set(ANN_LIBRARY_DIR ${CTL_DEPS}/ann/lib)
+#set(ANN_LIBRARIES libANN.so)
+#
+#include_directories(${ANN_INCLUDE_DIR}) 
+#link_directories(${ANN_LIBRARY_DIR}) 
+
+#If providing METIS uncomment out the lines below
+#set(METIS_FOUND 1) 
+#set(METIS_INCLUDE_DIR ${CTL_DEPS}/metis/include)
+#set(METIS_LIBRARY_DIR ${CTL_DEPS}/metis/libmetis)
+#set(METIS_LIBRARIES libmetis.so)
+
+#include_directories(${METIS_INCLUDE_DIR})
+#link_directories(${METIS_LIBRARY_DIR})
 
+#If providing DOXYGEN uncomment out the line below
+#set(DOXYGEN_FOUND 1)
+#set(DOXYGEN_INCLUDE_DIR /path/to/doxygen/include)
+#set(DOXYGEN_LIBRARY_DIR /path/to/doxygen/lib)
+#set(DOXYGEN_LIBRARIES ...)
 
 #We do not provide a build target for this. 
 #If you don't got it go get it yourself
@@ -29,37 +63,6 @@ set(MPI_FOUND 0)
 #set(MPI_LIBRARY_DIR /path/to/mpi/lib)
 #set(MPI_LIBRARIES ...) 
 
-#If providing TBB comment out the line below
-set(TBB_FOUND 0)
-#and uncomment these lines
-set(TBB_FOUND 1)
-set(TBB_INCLUDE_DIR /path/to/tbb/include)
-set(TBB_LIBRARY_DIR /path/to/tbb/build)
-set(TBB_LIBRARIES tbb tbbmalloc) 
-
-#If providing ANN comment out the line below
-set(ANN_FOUND 0)
-#and uncomment these lines
-set(ANN_FOUND 1)
-set(ANN_INCLUDE_DIR ${CTL_DEPS}/ann/include)
-set(ANN_LIBRARY_DIR ${CTL_DEPS}/ann/lib)
-set(ANN_LIBRARIES ANN) 
-
-#If providing METIS comment out the line below
-set(METIS_FOUND 0)
-#and uncomment these lines
-set(METIS_FOUND 1)
-set(METIS_INCLUDE_DIR ${CTL_DEPS}/metis/include)
-set(METIS_LIBRARY_DIR ${CTL_DEPS}/metis/libmetis)
-set(METIS_LIBRARIES libmetis.so)
-
-#If providing DOXYGEN comment out the line below
-set(DOXYGEN_FOUND 0)
-#and uncomment these lines
-#set(DOXYGEN_FOUND 1)
-#set(DOXYGEN_INCLUDE_DIR /path/to/doxygen/include)
-#set(DOXYGEN_LIBRARY_DIR /path/to/doxygen/lib)
-#set(DOXYGEN_LIBRARIES ...)
 
 ##These set the version for CMake ExternalProject_Add
 #Usually you wont touch these

dependencies/CMakeLists.txt

@@ -14,6 +14,7 @@ execute_process( COMMAND make
 		 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/dependencies/external/gtest)
 
 set(GTEST_ROOT ${CMAKE_SOURCE_DIR}/dependencies/gtest)
+
 find_package(GTest)
 
 
@@ -50,7 +51,6 @@ endif()
 if( Boost_FOUND)
 include_directories(${Boost_INCLUDE_DIR})
 link_directories(${Boost_LIBRARY_DIR})
-set(Boost_LIBRARIES ${Boost_LIBRARIES} )
 endif()
 
 #if( NOT MPI_FOUND)

dependencies/external/tbb/CMakeLists.txt

@@ -13,7 +13,9 @@ STAMP_DIR         ${TBB_PREFIX}/stamp
 DOWNLOAD_DIR      ${TBB_PREFIX}/download
 URL http://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${TBB_Version}_src.tgz
 SOURCE_DIR        ${TBB_PREFIX}/source
-BUILD_COMMAND     ./make -j ${TBB_VAR}
+CONFIGURE_COMMAND  ""
+UPDATE_COMMAND ""
+BUILD_COMMAND     make -j ${TBB_VAR}
 BUILD_IN_SOURCE 1
 INSTALL_COMMAND cp -r -p <SOURCE_DIR>/build <SOURCE_DIR>/include <INSTALL_DIR>/../tbb/
 )