Skip to content

Commit

Permalink
[guix] Removed ThirdParty/collection submodule.
Browse files Browse the repository at this point in the history
  • Loading branch information
bilke authored and endJunction committed Nov 1, 2023
1 parent 2b385ba commit 4b81665
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 12 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,3 @@
[submodule "ThirdParty/bilke/cmake-modules"]
path = ThirdParty/bilke/cmake-modules
url = https://github.com/bilke/cmake-modules.git
[submodule "ThirdParty/collection"]
path = ThirdParty/collection
url = https://gitlab.opengeosys.org/ogs/libs/collection.git
2 changes: 1 addition & 1 deletion .guix/modules/ogs-package.scm
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
(define vcs-file?
;; Return true if the given file is under version control.
(or (git-predicate "../..") ; (current-source-directory)
(const #t))) ;not in a Git checkout
(const #t))) ; not in a Git checkout

(define-public ogs
(package
Expand Down
1 change: 0 additions & 1 deletion ThirdParty/collection
Submodule collection deleted from 5d836e
7 changes: 0 additions & 7 deletions scripts/cmake/CMakeSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ if(WIN32 AND (NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio")
message(FATAL_ERROR "Wheels only build in Visual Studio!")
endif()

set(_collection ${PROJECT_SOURCE_DIR}/ThirdParty/collection)
# If submodules in ThirdParty/collection are initialized and this is a Guix
# build use submodule as CPM sources.
if(EXISTS ${_collection}/ogs/libs/xdmf/CMakeLists.txt AND GUIX_BUILD)
include(${_collection}/Setup.cmake)
endif()

# Set additional CMake modules path
set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/scripts/cmake"
Expand Down

0 comments on commit 4b81665

Please sign in to comment.