changed structure

sfarrens · Jun 23, 2020 · 8d644b6 · 8d644b6
1 parent ffdddb1
commit 8d644b6
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 29 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,30 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
-project(BigMac)
-
-# Enable OpenMP for Clang
-set(OpenMP_INCLUDE_PATH "/usr/local/include")
-set(OpenMP_LIB_PATH "/usr/local/lib")
-set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -lomp")
-set(OpenMP_CXX_LIB_NAMES "omp")
-set(OpenMP_CXX_LIBRARIES "${OpenMP_LIB_PATH}/libomp.dylib")
-include_directories(${OpenMP_INCLUDE_PATH})
-link_directories(${OpenMP_LIB_PATH})
-if(USE_FFTW)
-  set(FFTW_OMP_FLAGS "-lomp")
-  set(FFTW_CXX_FLAGS "-Xpreprocessor -fopenmp")
-endif(USE_FFTW)
-
-message(STATUS "OpenMP_CXX_FLAGS ${OpenMP_CXX_FLAGS}")
-
-# Set CXX FLAGS
-set(CMAKE_CXX_FLAGS "${OpenMP_CXX_FLAGS}")
-
-
-set(CPP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
-set(SOURCE_LIST hello_world)
-
-foreach(program ${SOURCE_LIST})
-	add_executable(${program} ${CPP_SOURCE_DIR}/${program}.cpp)
-endforeach(program)
-
-INSTALL(TARGETS ${SOURCES} DESTINATION bin)
+project(bigmac)
+if(CMAKE_BUILD_TYPE STREQUAL "")
+  set(CMAKE_BUILD_TYPE "Release")
+endif()
+string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
+add_subdirectory(${CMAKE_SOURCE_DIR}/bigmac)
diff --git a/bigmac/CMakeLists.txt b/bigmac/CMakeLists.txt
@@ -0,0 +1,29 @@
+cmake_minimum_required(VERSION 3.0)
+project(bigmac)
+
+# Enable OpenMP for Clang
+set(OpenMP_INCLUDE_PATH "/usr/local/include")
+set(OpenMP_LIB_PATH "/usr/local/lib")
+set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -lomp")
+set(OpenMP_CXX_LIB_NAMES "omp")
+set(OpenMP_CXX_LIBRARIES "${OpenMP_LIB_PATH}/libomp.dylib")
+include_directories(${OpenMP_INCLUDE_PATH})
+link_directories(${OpenMP_LIB_PATH})
+if(USE_FFTW)
+  set(FFTW_OMP_FLAGS "-lomp")
+  set(FFTW_CXX_FLAGS "-Xpreprocessor -fopenmp")
+endif(USE_FFTW)
+
+message(STATUS "OpenMP_CXX_FLAGS ${OpenMP_CXX_FLAGS}")
+
+# Set CXX FLAGS
+set(CMAKE_CXX_FLAGS "${OpenMP_CXX_FLAGS}")
+
+set(CPP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
+set(SOURCE_LIST hello_world)
+
+foreach(program ${SOURCE_LIST})
+	add_executable(${program} ${CPP_SOURCE_DIR}/${program}.cpp)
+endforeach(program)
+
+INSTALL(TARGETS ${SOURCE_LIST} DESTINATION bin)
diff --git a/bigmac/hello_world b/bigmac/hello_world
diff --git a/lib/cmake/BigMacConfig.cmake → bigmac/lib/cmake/BigMacConfig.cmake b/lib/cmake/BigMacConfig.cmake → bigmac/lib/cmake/BigMacConfig.cmake
diff --git a/src/hello_world.cpp → bigmac/src/hello_world.cpp b/src/hello_world.cpp → bigmac/src/hello_world.cpp