Move cmake modules into own/clearer directory

middagj · Jul 27, 2023 · a51b6d3 · a51b6d3
1 parent c97d646
commit a51b6d3
Show file tree

Hide file tree

Showing 19 changed files with 16 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -109,7 +109,7 @@ message(STATUS "Build Configuration: ${CMAKE_BUILD_TYPE}")
 
 # Build Modules Path
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
-                      ${CMAKE_SOURCE_DIR}/modules
+                      ${CMAKE_SOURCE_DIR}/cmake/modules
                       )
 
 # Custom Modules

diff --git a/Makefile.am b/Makefile.am
@@ -21,9 +21,9 @@ EXTRA_DIST =	$(srcdir)/CMakeLists.txt \
 		$(srcdir)/FIPS-NOTES.md \
 		$(srcdir)/LICENSE \
 		$(srcdir)/m4/*.m4 \
-		$(srcdir)/modules/*.cmake \
-		$(srcdir)/modules/tests/*.c \
-		$(srcdir)/modules/tests/*.cpp \
+		$(srcdir)/cmake/modules/*.cmake \
+		$(srcdir)/cmake/modules/tests/*.c \
+		$(srcdir)/cmake/modules/tests/*.cpp \
 		$(srcdir)/OSX-NOTES.md \
 		$(srcdir)/README.md \
 		$(srcdir)/win32/convarch/convarch.vcxproj.in \

diff --git a/modules/CompilerOptions.cmake → cmake/modules/CompilerOptions.cmake b/modules/CompilerOptions.cmake → cmake/modules/CompilerOptions.cmake
@@ -177,7 +177,7 @@ if(WITH_CRYPTO_BACKEND STREQUAL "botan")
 
     # acx_botan_ecc.m4
     if(ENABLE_ECC)
-        set(testfile ${CMAKE_SOURCE_DIR}/modules/tests/test_botan_ecc.cpp)
+        set(testfile ${CMAKE_SOURCE_DIR}/cmake/modules/tests/test_botan_ecc.cpp)
         try_run(RUN_ECC COMPILE_RESULT
                 "${CMAKE_BINARY_DIR}/prebuild_santity_tests" ${testfile}
                 LINK_LIBRARIES ${CRYPTO_LIBS}
@@ -198,7 +198,7 @@ if(WITH_CRYPTO_BACKEND STREQUAL "botan")
     # acx_botan_eddsa.m4
     if(ENABLE_EDDSA)
         # ED25519
-        set(testfile ${CMAKE_SOURCE_DIR}/modules/tests/test_botan_ed25519.cpp)
+        set(testfile ${CMAKE_SOURCE_DIR}/cmake/modules/tests/test_botan_ed25519.cpp)
         try_run(RUN_ED25519 COMPILE_RESULT
                 "${CMAKE_BINARY_DIR}/prebuild_santity_tests" ${testfile}
                 LINK_LIBRARIES ${CRYPTO_LIBS}
@@ -218,7 +218,7 @@ if(WITH_CRYPTO_BACKEND STREQUAL "botan")
 
     # acx_botan_gost.m4
     if(ENABLE_GOST)
-        set(testfile ${CMAKE_SOURCE_DIR}/modules/tests/test_botan_gost.cpp)
+        set(testfile ${CMAKE_SOURCE_DIR}/cmake/modules/tests/test_botan_gost.cpp)
         try_run(RUN_GOST COMPILE_RESULT
                 "${CMAKE_BINARY_DIR}/prebuild_santity_tests" ${testfile}
                 LINK_LIBRARIES ${CRYPTO_LIBS}
@@ -244,7 +244,7 @@ if(WITH_CRYPTO_BACKEND STREQUAL "botan")
     set(HAVE_AES_KEY_WRAP 1)
 
     # acx_botan_rfc5649.m4
-    set(testfile ${CMAKE_SOURCE_DIR}/modules/tests/test_botan_rfc5649.cpp)
+    set(testfile ${CMAKE_SOURCE_DIR}/cmake/modules/tests/test_botan_rfc5649.cpp)
     try_run(RUN_AES_KEY_WRAP_PAD COMPILE_RESULT
             "${CMAKE_BINARY_DIR}/prebuild_santity_tests" ${testfile}
             LINK_LIBRARIES ${CRYPTO_LIBS}
@@ -259,7 +259,7 @@ if(WITH_CRYPTO_BACKEND STREQUAL "botan")
     endif()
 
     # acx_botan_rawpss.m4
-    set(testfile ${CMAKE_SOURCE_DIR}/modules/tests/test_botan_rawpss.cpp)
+    set(testfile ${CMAKE_SOURCE_DIR}/cmake/modules/tests/test_botan_rawpss.cpp)
     try_run(RUN_RAWPSS COMPILE_RESULT
             "${CMAKE_BINARY_DIR}/prebuild_santity_tests" ${testfile}
             LINK_LIBRARIES ${CRYPTO_LIBS}
@@ -299,7 +299,7 @@ elseif(WITH_CRYPTO_BACKEND STREQUAL "openssl")
 
     # acx_openssl_ecc.m4
     if(ENABLE_ECC)
-        set(testfile ${CMAKE_SOURCE_DIR}/modules/tests/test_openssl_ecc.c)
+        set(testfile ${CMAKE_SOURCE_DIR}/cmake/modules/tests/test_openssl_ecc.c)
         try_run(RUN_ECC COMPILE_RESULT
                 "${CMAKE_BINARY_DIR}/prebuild_santity_tests" ${testfile}
                 LINK_LIBRARIES ${CRYPTO_LIBS}
@@ -320,7 +320,7 @@ elseif(WITH_CRYPTO_BACKEND STREQUAL "openssl")
     # acx_openssl_eddsa.m4
     if(ENABLE_EDDSA)
         # ED25519
-        set(testfile ${CMAKE_SOURCE_DIR}/modules/tests/test_openssl_ed25519.c)
+        set(testfile ${CMAKE_SOURCE_DIR}/cmake/modules/tests/test_openssl_ed25519.c)
         try_run(RUN_ED25519 COMPILE_RESULT
                 "${CMAKE_BINARY_DIR}/prebuild_santity_tests" ${testfile}
                 LINK_LIBRARIES ${CRYPTO_LIBS}
@@ -335,7 +335,7 @@ elseif(WITH_CRYPTO_BACKEND STREQUAL "openssl")
             message(FATAL_ERROR ${error_msg})
         endif()
         # ED448
-        set(testfile ${CMAKE_SOURCE_DIR}/modules/tests/test_openssl_ed448.c)
+        set(testfile ${CMAKE_SOURCE_DIR}/cmake/modules/tests/test_openssl_ed448.c)
         try_run(RUN_ED448 COMPILE_RESULT
                 "${CMAKE_BINARY_DIR}/prebuild_santity_tests" ${testfile}
                 LINK_LIBRARIES ${CRYPTO_LIBS}
@@ -354,7 +354,7 @@ elseif(WITH_CRYPTO_BACKEND STREQUAL "openssl")
 
     # acx_openssl_gost.m4
     if(ENABLE_GOST)
-        set(testfile ${CMAKE_SOURCE_DIR}/modules/tests/test_openssl_gost.c)
+        set(testfile ${CMAKE_SOURCE_DIR}/cmake/modules/tests/test_openssl_gost.c)
         try_run(RUN_GOST COMPILE_RESULT
                 "${CMAKE_BINARY_DIR}/prebuild_santity_tests" ${testfile}
                 LINK_LIBRARIES ${CRYPTO_LIBS}
@@ -374,7 +374,7 @@ elseif(WITH_CRYPTO_BACKEND STREQUAL "openssl")
 
     # acx_openssl_fips.m4
     if(ENABLE_FIPS)
-        set(testfile ${CMAKE_SOURCE_DIR}/modules/tests/test_openssl_fips.c)
+        set(testfile ${CMAKE_SOURCE_DIR}/cmake/modules/tests/test_openssl_fips.c)
         try_run(RUN_FIPS COMPILE_RESULT
                 "${CMAKE_BINARY_DIR}/prebuild_santity_tests" ${testfile}
                 LINK_LIBRARIES ${CRYPTO_LIBS}
@@ -393,7 +393,7 @@ elseif(WITH_CRYPTO_BACKEND STREQUAL "openssl")
     endif(ENABLE_FIPS)
 
     # acx_openssl_rfc3349
-    set(testfile ${CMAKE_SOURCE_DIR}/modules/tests/test_openssl_rfc3394.c)
+    set(testfile ${CMAKE_SOURCE_DIR}/cmake/modules/tests/test_openssl_rfc3394.c)
     try_run(RUN_AES_KEY_WRAP COMPILE_RESULT
             "${CMAKE_BINARY_DIR}/prebuild_santity_tests" ${testfile}
             LINK_LIBRARIES ${CRYPTO_LIBS}
@@ -408,7 +408,7 @@ elseif(WITH_CRYPTO_BACKEND STREQUAL "openssl")
     endif()
 
     # acx_openssl_rfc5649
-    set(testfile ${CMAKE_SOURCE_DIR}/modules/tests/test_openssl_rfc5649.c)
+    set(testfile ${CMAKE_SOURCE_DIR}/cmake/modules/tests/test_openssl_rfc5649.c)
     try_run(RUN_AES_KEY_WRAP_PAD COMPILE_RESULT
             "${CMAKE_BINARY_DIR}/prebuild_santity_tests" ${testfile}
             LINK_LIBRARIES ${CRYPTO_LIBS}

diff --git a/modules/FindBotan.cmake → cmake/modules/FindBotan.cmake b/modules/FindBotan.cmake → cmake/modules/FindBotan.cmake
diff --git a/modules/FindCppUnit.cmake → cmake/modules/FindCppUnit.cmake b/modules/FindCppUnit.cmake → cmake/modules/FindCppUnit.cmake
diff --git a/modules/FindSQLite3.cmake → cmake/modules/FindSQLite3.cmake b/modules/FindSQLite3.cmake → cmake/modules/FindSQLite3.cmake
diff --git a/modules/tests/test_botan_aes_gcm.cpp → cmake/modules/tests/test_botan_aes_gcm.cpp b/modules/tests/test_botan_aes_gcm.cpp → cmake/modules/tests/test_botan_aes_gcm.cpp
diff --git a/modules/tests/test_botan_ecc.cpp → cmake/modules/tests/test_botan_ecc.cpp b/modules/tests/test_botan_ecc.cpp → cmake/modules/tests/test_botan_ecc.cpp
diff --git a/modules/tests/test_botan_ed25519.cpp → cmake/modules/tests/test_botan_ed25519.cpp b/modules/tests/test_botan_ed25519.cpp → cmake/modules/tests/test_botan_ed25519.cpp
diff --git a/modules/tests/test_botan_gost.cpp → cmake/modules/tests/test_botan_gost.cpp b/modules/tests/test_botan_gost.cpp → cmake/modules/tests/test_botan_gost.cpp
diff --git a/modules/tests/test_botan_rawpss.cpp → cmake/modules/tests/test_botan_rawpss.cpp b/modules/tests/test_botan_rawpss.cpp → cmake/modules/tests/test_botan_rawpss.cpp
diff --git a/modules/tests/test_botan_rfc5649.cpp → cmake/modules/tests/test_botan_rfc5649.cpp b/modules/tests/test_botan_rfc5649.cpp → cmake/modules/tests/test_botan_rfc5649.cpp
diff --git a/modules/tests/test_openssl_ecc.c → cmake/modules/tests/test_openssl_ecc.c b/modules/tests/test_openssl_ecc.c → cmake/modules/tests/test_openssl_ecc.c
diff --git a/modules/tests/test_openssl_ed25519.c → cmake/modules/tests/test_openssl_ed25519.c b/modules/tests/test_openssl_ed25519.c → cmake/modules/tests/test_openssl_ed25519.c
diff --git a/modules/tests/test_openssl_ed448.c → cmake/modules/tests/test_openssl_ed448.c b/modules/tests/test_openssl_ed448.c → cmake/modules/tests/test_openssl_ed448.c
diff --git a/modules/tests/test_openssl_fips.c → cmake/modules/tests/test_openssl_fips.c b/modules/tests/test_openssl_fips.c → cmake/modules/tests/test_openssl_fips.c
diff --git a/modules/tests/test_openssl_gost.c → cmake/modules/tests/test_openssl_gost.c b/modules/tests/test_openssl_gost.c → cmake/modules/tests/test_openssl_gost.c
diff --git a/modules/tests/test_openssl_rfc3394.c → cmake/modules/tests/test_openssl_rfc3394.c b/modules/tests/test_openssl_rfc3394.c → cmake/modules/tests/test_openssl_rfc3394.c
diff --git a/modules/tests/test_openssl_rfc5649.c → cmake/modules/tests/test_openssl_rfc5649.c b/modules/tests/test_openssl_rfc5649.c → cmake/modules/tests/test_openssl_rfc5649.c