Cleaned up CMakeLists

CMakeLists.txt

@@ -2,33 +2,22 @@ cmake_minimum_required(VERSION 3.0)
 
 project(tangle_project)
 
-# ------------------------------
-# ---- USER OPTIONS
-# ------------------------------
+# EDIT HERE 
 
 set(USER_SOURCE "example.c")
 set(OUTPUT_EXE "example")
 
-# ------------------------------
-# ---- TANGLE LIBRARY
-# ------------------------------
+option(DISTRIBUTED "Use MPI" OFF)
+
+# END EDIT
 
 if (NOT DEFINED ${TANGLE_LIB_PATH})
-    # Build libtangle.so
     set(TANGLE_DIR "tangle")
     add_subdirectory(${TANGLE_DIR})
     set(TANGLE_LIB_PATH "${CMAKE_CURRENT_BINARY_DIR}/${TANGLE_DIR}")
     set(TANGLE_LIB_EXACT "${TANGLE_LIB_PATH}/libtangle.so")
 endif()
 
-# ------------------------------
-# ---- USER EXECUTABLE
-# ------------------------------
-
-message(STATUS "Compiling ${USER_SOURCE} to executable ${OUTPUT_EXE}")
 
-# Create user executable
 add_executable(${OUTPUT_EXE} ${USER_SOURCE})
-
-# Link libraries to user executable, including Tangle
 target_link_libraries(${OUTPUT_EXE} tangle)

example.c

@@ -1,14 +1,14 @@
 #include "tangle.h"
 
 #include <stdio.h>
-#include "mpi.h"
+// #include "mpi.h"
 
 int main() {
-  MPI_Init(NULL, NULL);
+  // MPI_Init(NULL, NULL);
 
   count_to(10); 
 
-  MPI_Finalize();
+  // MPI_Finalize();
 
   return 0;
 }

tangle/CMakeLists.txt

@@ -1,29 +1,13 @@
-# Builds Tangle as a shared library, libtangle.so
+# option(DISTRIBUTED "Use MPI" OFF)
 
-# ------------------------------
-# ---- OPTIONS
-# ------------------------------
-
-option(DISTRIBUTED "Use MPI" ON)
-
-# ------------------------------
-# ---- FIND PACKAGES
-# ------------------------------
 
 if (DISTRIBUTED)
     find_package(MPI REQUIRED)
     include_directories(${MPI_INCLUDE_PATH})
 endif()
 
-# ------------------------------
-# ---- COMPILER FLAGS
-# ------------------------------
-
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
 
-# ------------------------------
-# ---- BUILD LIBRARY
-# ------------------------------
 
 add_subdirectory(src)
 message("Tangle Source: ${TANGLE_SRC}")
@@ -33,9 +17,6 @@ add_library(tangle SHARED ${TANGLE_SRC})
 target_include_directories(tangle PRIVATE src PUBLIC include)
 target_link_libraries(tangle ${MPI_C_LIBRARIES})
 
-# ------------------------------
-# ---- DEFINITIONS
-# ------------------------------
 
 if (DISTRIBUTED)
     add_compile_definitions(_DISTRIBUTED)

tangle/src/CMakeLists.txt

@@ -1,14 +1,11 @@
-
-
 if (DISTRIBUTED)
-    message("Dis")
     set(TANGLE_SRC
-        ${CMAKE_CURRENT_SOURCE_DIR}/implementation_mpi.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/impl_mpi.c
         PARENT_SCOPE
     )
 else()
     set(TANGLE_SRC
-        ${CMAKE_CURRENT_SOURCE_DIR}/implementation.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/impl.c
         PARENT_SCOPE
     )
 endif()