Skip to content

always use preferred linalg-modules #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wavefunction91 merged 2 commits into from
Jun 29, 2023
Merged

always use preferred linalg-modules #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a03dc3
Set CMAKE_MODULE_PATH appropriately to always use preferred linalg-mo…
ajaypanyala Jun 28, 2023
1065abd
fix for gauxc-config.cmake.in
ajaypanyala Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ set( FETCHCONTENT_UPDATES_DISCONNECTED ON CACHE BOOL "Disable FC Updates" )
project( GauXC VERSION 0.0.1 LANGUAGES C CXX )

# Place local modules in the path
list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules )
list( PREPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
list( PREPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules )
include( gauxc-linalg-modules )

# Guard some options settings to only default when not a subproject
Expand Down Expand Up @@ -83,3 +83,10 @@ add_subdirectory( src )
if( CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND GAUXC_ENABLE_TESTS AND BUILD_TESTING )
add_subdirectory( tests )
endif()

list(REMOVE_AT CMAKE_MODULE_PATH 0)
list(REMOVE_AT CMAKE_MODULE_PATH 0)

if( linalg-cmake-modules_POPULATED )
list(REMOVE_AT CMAKE_MODULE_PATH 0)
endif()
8 changes: 4 additions & 4 deletions cmake/gauxc-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.18 FATAL_ERROR) # Require CMake 3.18+

get_filename_component(GauXC_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)

list(APPEND CMAKE_MODULE_PATH ${GauXC_CMAKE_DIR} )
list(APPEND CMAKE_MODULE_PATH ${GauXC_CMAKE_DIR}/linalg-cmake-modules )
list(PREPEND CMAKE_MODULE_PATH ${GauXC_CMAKE_DIR} )
list(PREPEND CMAKE_MODULE_PATH ${GauXC_CMAKE_DIR}/linalg-cmake-modules )
include(CMakeFindDependencyMacro)

# Always Required Dependencies
Expand Down Expand Up @@ -53,8 +53,8 @@ if( GAUXC_ENABLE_HDF5 )
find_dependency( HighFive )
endif()

list(REMOVE_AT CMAKE_MODULE_PATH -1)
list(REMOVE_AT CMAKE_MODULE_PATH -1)
list(REMOVE_AT CMAKE_MODULE_PATH 0)
list(REMOVE_AT CMAKE_MODULE_PATH 0)

if(NOT TARGET gauxc::gauxc)
include("${GauXC_CMAKE_DIR}/gauxc-targets.cmake")
Expand Down
2 changes: 1 addition & 1 deletion cmake/gauxc-linalg-modules.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ FetchContent_Declare( linalg-cmake-modules
FetchContent_GetProperties( linalg-cmake-modules )
if( NOT linalg-cmake-modules_POPULATED )
FetchContent_Populate( linalg-cmake-modules )
list( APPEND CMAKE_MODULE_PATH ${linalg-cmake-modules_SOURCE_DIR} )
list( PREPEND CMAKE_MODULE_PATH ${linalg-cmake-modules_SOURCE_DIR} )
endif()