Add provision to use pre-built decomp2d library using cmake .. -Ddeco…

…mp2d_INCLUDE_DIRS=/path-to-2decomp-fft/build
xcompact3d · Oct 22, 2024 · c0649d2 · c0649d2
1 parent 151eea7
commit c0649d2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/cmake/Finddecomp2d.cmake b/cmake/Finddecomp2d.cmake
@@ -1,6 +1,6 @@
 # - Find the 2decomp-fft library
 find_package(decomp2d
-             PATHS ${CMAKE_SOURCE_DIR}/decomp2d/build)
+             PATHS ${CMAKE_SOURCE_DIR}/decomp2d/build ${decomp2d_INCLUDE_DIRS})
 if (decomp2d_FOUND)
   message(STATUS "2decomp-fft FOUND")
 else(decomp2d_FOUND)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -78,7 +78,6 @@ if (${POISSON_SOLVER} STREQUAL "FFT" AND ${BACKEND} STREQUAL "OMP")
   message(STATUS "Using the FFT poisson solver with 2decomp&fft")
   set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
   find_package(decomp2d REQUIRED)
-  include_directories(${decomp2d_INCLUDE_DIRS})
   target_link_libraries(decomp2d)
   target_link_libraries(x3d2 PRIVATE decomp2d)
 endif()