Merge pull request #12 from crvs/refactor_all

Refactor all

CMakeLists.txt

@@ -10,7 +10,8 @@ project(simplicial CXX)
 #   * boost under /usr/include/boost
 #   * CGAL under /usr/include/CGAL
 #
-set(EIGEN3_INCLUDE_DIR "/usr/include/eigen3")
+set(EIGEN3_INCLUDE_DIR "/usr/local/include/eigen3")
+set(EIGEN3_INCLUDE_DIR "/home/crvs/eigen-3.3.2")
 include_directories(${EIGEN3_INCLUDE_DIR})
 set(CGAL_INCLUDE_DIR "/usr/local/include")
 include_directories(${CGAL_INCLUDE_DIR})
@@ -21,19 +22,61 @@ include(${CGAL_USE_FILE})
 # end_requirements
 
 
+# Using CLANG instead of gcc for reasons
+set(CMAKE_C_COMPILER             "/usr/bin/clang-3.8")
+set(CMAKE_C_FLAGS                "-Wall -std=c99")
+set(CMAKE_C_FLAGS_DEBUG          "-g")
+set(CMAKE_C_FLAGS_MINSIZEREL     "-Os -DNDEBUG")
+set(CMAKE_C_FLAGS_RELEASE        "-O4 -DNDEBUG")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g")
+
+set(CMAKE_CXX_COMPILER             "/usr/bin/clang++-3.8")
+set(CMAKE_CXX_FLAGS                "-Wall -std=c++11")
+set(CMAKE_CXX_FLAGS_DEBUG          "-g")
+set(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASE        "-O4 -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+# Linker flags for
+# set(CMAKE_CXX_FLAGS "-lspatialindex_c -lspatialindex ${CMAKE_CXX_FLAGS}")
+
+set(CMAKE_AR      "/usr/bin/llvm-ar")
+set(CMAKE_LINKER  "/usr/bin/llvm-ld")
+set(CMAKE_NM      "/usr/bin/llvm-nm")
+set(CMAKE_OBJDUMP "/usr/bin/llvm-objdump")
+set(CMAKE_RANLIB  "/usr/bin/llvm-ranlib")
 
 set(CMAKE_BUILD_TYPE Debug)
-include_directories("./lib")
 
-set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+include_directories("./lib") # where the header files are
 
-set(STUPID_SOURCES "./src/main.cpp")
-add_executable(my_stupid_test ${STUPID_SOURCES})
+add_library(scomplex SHARED "./lib/scomplex/simplicial_complex.cpp")
+add_library(coeffflow SHARED "./lib/scomplex/coeff_flow.cpp")
+add_library(pathsnap SHARED "./lib/scomplex/path_snapper.cpp")
 
-set(YOTHER_STUPID_SOURCES "./src/graphtest.cpp")
-add_executable(yother_stupid_test ${YOTHER_STUPID_SOURCES})
+add_executable(test0 "src/test0.cpp")
+target_link_libraries(test0 scomplex)
 
-# set(CMAKE_CXX_FLAGS "-lspatialindex_c -lspatialindex ${CMAKE_CXX_FLAGS}")
- set(OTHER_STUPID_SOURCES "./src/libtest.cpp")
-add_executable(my_other_stupid_test ${OTHER_STUPID_SOURCES})
+add_executable(test1 "src/test1.cpp")
+target_link_libraries(test1 scomplex pathsnap)
+
+add_executable(test2 "src/test2.cpp")
+target_link_libraries(test2 scomplex pathsnap)
+
+add_executable(test3 "src/test3.cpp")
+target_link_libraries(test3 scomplex pathsnap)
+
+add_executable(test4 "src/test4.cpp")
+target_link_libraries(test4 scomplex pathsnap)
+
+add_executable(test5 "src/test5.cpp")
+target_link_libraries(test5 scomplex pathsnap)
+
+# set(STUPID_SOURCES "./src/main.cpp")
+# add_executable(my_stupid_test ${STUPID_SOURCES})
+
+# set(YOTHER_STUPID_SOURCES "./src/graphtest.cpp")
+# add_executable(yother_stupid_test ${YOTHER_STUPID_SOURCES})
+
+# set(OTHER_STUPID_SOURCES "./src/libtest.cpp")
+# add_executable(my_other_stupid_test ${OTHER_STUPID_SOURCES})