From 68c0c74faad21849c6045cebe55b8c7d4d997f6e Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Wed, 7 Dec 2022 11:17:04 -0500 Subject: [PATCH 1/2] Consolidate duplication in top level CMakeLists.txt logic. --- CMakeLists.txt | 68 ++++++++++++++++---------------------------------- 1 file changed, 21 insertions(+), 47 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 586e56e0..5863f125 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,15 +11,6 @@ set(TBB_TEST OFF CACHE BOOL " " FORCE) set(TBB_EXAMPLES OFF CACHE BOOL " " FORCE) add_subdirectory(arrangements/external/oneTBB) -# add the executable -add_executable(${PROJECT_NAME} main.cpp) - -target_include_directories(${PROJECT_NAME} PUBLIC - ./ - code/ - arrangements/code/ -) - set(cinolib_DIR ${PROJECT_SOURCE_DIR}/arrangements/external/Cinolib) set(CINOLIB_USES_OPENGL_GLFW_IMGUI ON) set(CINOLIB_USES_SHEWCHUK_PREDICATES ON) @@ -27,51 +18,34 @@ set(CINOLIB_USES_INDIRECT_PREDICATES ON) find_package(cinolib REQUIRED) -target_link_libraries(${PROJECT_NAME} cinolib) -target_link_libraries(${PROJECT_NAME} tbb) -target_compile_definitions(${PROJECT_NAME} PUBLIC TBB_PARALLEL=1) -target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/arrangements/external/abseil-cpp/) -target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/arrangements/external/oneTBB/) - +set(IRMB_INCLUDE_DIRS + ${PROJECT_SOURCE_DIR} + ${PROJECT_SOURCE_DIR}/code + ${PROJECT_SOURCE_DIR}/arrangements/code + ${PROJECT_SOURCE_DIR}/arrangements/external/abseil-cpp + ${PROJECT_SOURCE_DIR}/arrangements/external/oneTBB + ) -add_executable(${PROJECT_NAME}_rotation main-rotation.cpp) +set(IRMB_LIBS cinolib tbb) -target_include_directories(${PROJECT_NAME}_rotation PUBLIC - ./ - code/ - arrangements/code/ -) +# add the executable +add_executable(${PROJECT_NAME} main.cpp) +target_include_directories(${PROJECT_NAME} PUBLIC ${IRMB_INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} ${IRMB_LIBS}) +target_compile_definitions(${PROJECT_NAME} PUBLIC TBB_PARALLEL=1) -target_link_libraries(${PROJECT_NAME}_rotation cinolib) -target_link_libraries(${PROJECT_NAME}_rotation tbb) +add_executable(${PROJECT_NAME}_rotation main-rotation.cpp) +target_include_directories(${PROJECT_NAME}_rotation PUBLIC ${IRMB_INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME}_rotation ${IRMB_LIBS}) target_compile_definitions(${PROJECT_NAME}_rotation PUBLIC TBB_PARALLEL=1) -target_include_directories(${PROJECT_NAME}_rotation PUBLIC ${PROJECT_SOURCE_DIR}/arrangements/external/abseil-cpp/) -target_include_directories(${PROJECT_NAME}_rotation PUBLIC ${PROJECT_SOURCE_DIR}/arrangements/external/oneTBB/) add_executable(${PROJECT_NAME}_arap main-arap.cpp) - -target_include_directories(${PROJECT_NAME}_arap PUBLIC - ./ - code/ - arrangements/code/ -) - -target_link_libraries(${PROJECT_NAME}_arap cinolib) -target_link_libraries(${PROJECT_NAME}_arap tbb) +target_include_directories(${PROJECT_NAME}_arap PUBLIC ${IRMB_INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME}_arap ${IRMB_LIBS}) target_compile_definitions(${PROJECT_NAME}_arap PUBLIC TBB_PARALLEL=1) -target_include_directories(${PROJECT_NAME}_arap PUBLIC ${PROJECT_SOURCE_DIR}/arrangements/external/abseil-cpp/) -target_include_directories(${PROJECT_NAME}_arap PUBLIC ${PROJECT_SOURCE_DIR}/arrangements/external/oneTBB/) add_executable(${PROJECT_NAME}_stencil main-stencil.cpp) - -target_include_directories(${PROJECT_NAME}_stencil PUBLIC - ./ - code/ - arrangements/code/ -) - -target_link_libraries(${PROJECT_NAME}_stencil cinolib) -target_link_libraries(${PROJECT_NAME}_stencil tbb) +target_include_directories(${PROJECT_NAME}_stencil PUBLIC ${IRMB_INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME}_stencil ${IRMB_LIBS}) target_compile_definitions(${PROJECT_NAME}_stencil PUBLIC TBB_PARALLEL=1) -target_include_directories(${PROJECT_NAME}_stencil PUBLIC ${PROJECT_SOURCE_DIR}/arrangements/external/abseil-cpp/) -target_include_directories(${PROJECT_NAME}_stencil PUBLIC ${PROJECT_SOURCE_DIR}/arrangements/external/oneTBB/) + From 8de7809ee24c0297188518baad2fbd4b3e3d707d Mon Sep 17 00:00:00 2001 From: Clifford Yapp <238416+starseeker@users.noreply.github.com> Date: Wed, 7 Dec 2022 11:18:34 -0500 Subject: [PATCH 2/2] Add footer for editor indentations --- CMakeLists.txt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5863f125..5bf2d8ce 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,12 +19,12 @@ set(CINOLIB_USES_INDIRECT_PREDICATES ON) find_package(cinolib REQUIRED) set(IRMB_INCLUDE_DIRS - ${PROJECT_SOURCE_DIR} - ${PROJECT_SOURCE_DIR}/code - ${PROJECT_SOURCE_DIR}/arrangements/code - ${PROJECT_SOURCE_DIR}/arrangements/external/abseil-cpp - ${PROJECT_SOURCE_DIR}/arrangements/external/oneTBB - ) + ${PROJECT_SOURCE_DIR} + ${PROJECT_SOURCE_DIR}/code + ${PROJECT_SOURCE_DIR}/arrangements/code + ${PROJECT_SOURCE_DIR}/arrangements/external/abseil-cpp + ${PROJECT_SOURCE_DIR}/arrangements/external/oneTBB + ) set(IRMB_LIBS cinolib tbb) @@ -49,3 +49,11 @@ target_include_directories(${PROJECT_NAME}_stencil PUBLIC ${IRMB_INCLUDE_DIRS}) target_link_libraries(${PROJECT_NAME}_stencil ${IRMB_LIBS}) target_compile_definitions(${PROJECT_NAME}_stencil PUBLIC TBB_PARALLEL=1) + +# Local Variables: +# tab-width: 8 +# mode: cmake +# indent-tabs-mode: t +# End: +# ex: shiftwidth=2 tabstop=8 +