Skip to content

Commit cae12d0

Browse files
authored
Merge pull request #5 from externpro/xpupdate-26.01.1-53-g5a9747e-26801752938-1
externpro 26.01.1-53-g5a9747e
2 parents 137dfad + 3aad98a commit cae12d0

7 files changed

Lines changed: 1772 additions & 1 deletion

File tree

.github/release-tag.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"message": "xpro version 1.0.22.1 tag",
3+
"tag": "xpv1.0.22.1"
4+
}

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,7 @@ tmp/
193193
Vagrantfile
194194
zig-cache
195195
zig-out
196+
# externpro
197+
.env
198+
_bld*/
199+
docker-compose.override.yml

CMakeLists.txt

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
cmake_minimum_required(VERSION 4.3)
2+
file(STRINGS configure.ac configure_ac REGEX ^AC_INIT)
3+
string(REGEX MATCH "([0-9]+)[.][0-9]+[.][0-9]+" VER "${configure_ac}")
4+
project(libsodium VERSION ${VER} LANGUAGES C ASM)
5+
include(configure.cmake)
6+
set_property(GLOBAL PROPERTY USE_FOLDERS ON) # enables Solution Folders
7+
option(DISABLE_TESTS "Disable tests" OFF)
8+
option(ENABLE_BLOCKING_RANDOM "Enable only if /dev/urandom is totally broken on the target platform" OFF)
9+
option(ENABLE_MINIMAL "Only compile the minimum set of functions required for the high-level API" OFF)
10+
########################################
11+
function(compareCmakeFilesys files)
12+
file(GLOB_RECURSE filesys RELATIVE ${CMAKE_CURRENT_LIST_DIR} *)
13+
file(GLOB_RECURSE ignorefiles RELATIVE ${CMAKE_CURRENT_LIST_DIR} .*.swp)
14+
if(ignorefiles)
15+
list(REMOVE_ITEM filesys ${ignorefiles})
16+
endif()
17+
foreach(f ${filesys})
18+
list(FIND files ${f} index)
19+
if(${index} GREATER -1)
20+
list(REMOVE_AT files ${index})
21+
list(REMOVE_ITEM filesys ${f})
22+
endif()
23+
endforeach()
24+
if(filesys)
25+
message(FATAL_ERROR "files not in cmake: ${filesys}")
26+
endif()
27+
foreach(f ${files})
28+
get_filename_component(absPath ${f} ABSOLUTE)
29+
if(NOT absPath MATCHES CMAKE_CURRENT_LIST_DIR)
30+
# remove any files that aren't under CMAKE_CURRENT_LIST_DIR
31+
list(REMOVE_ITEM files ${f})
32+
endif()
33+
endforeach()
34+
if(files)
35+
message(FATAL_ERROR "files not in repo, but in cmake: ${files}")
36+
endif()
37+
endfunction()
38+
########################################
39+
add_subdirectory(src/libsodium)
40+
if(NOT DISABLE_TESTS)
41+
enable_testing()
42+
add_subdirectory(test)
43+
endif()

0 commit comments

Comments
 (0)