CMake configuration updated #14

NilFoundation · Jun 2, 2023 · 08eb154 · 08eb154
1 parent e461838
commit 08eb154
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 51 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,14 +1,27 @@
+#---------------------------------------------------------------------------#
+# Copyright (c) 2018-2023 Mikhail Komarov <[email protected]>
+#
+# Distributed under the Boost Software License, Version 1.0
+# See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt
+#---------------------------------------------------------------------------#
+
 cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
+cmake_policy(SET CMP0028 NEW)
+cmake_policy(SET CMP0042 NEW)
+cmake_policy(SET CMP0048 NEW)
+cmake_policy(SET CMP0057 NEW)
+cmake_policy(SET CMP0077 NEW)
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake"
-     "${CMAKE_CURRENT_LIST_DIR}/cmake/modules/share/modules/cmake"
-     "/usr/share/zkllvm")
+     "${CMAKE_CURRENT_LIST_DIR}/cmake/modules/share/modules/cmake")
 
 include(CMConfig)
+include(CMDeploy)
 include(CMSetupVersion)
-include(CircuitCompile)
 
-cm_workspace(crypto3)
+cm_workspace(zkllvm)
 
 macro(cm_find_package NAME)
     if(NOT "${NAME}" MATCHES "^${CMAKE_WORKSPACE_NAME}_.*$" AND NOT "${NAME}" STREQUAL CM)
@@ -18,9 +31,5 @@ macro(cm_find_package NAME)
     endif()
 endmacro()
 
-cm_setup_version(VERSION 0.1.0 PREFIX ${CMAKE_WORKSPACE_NAME})
-
 add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/libs/crypto3")
-
-#Example directories
-add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/src")
+add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/src")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,42 +1,67 @@
-function(add_example example_target)
-    set(prefix ARG)
-    set(noValues "")
-    set(singleValues INPUT)
-    set(multiValues SOURCES)
-    cmake_parse_arguments(${prefix}
-                        "${noValues}"
-                        "${singleValues}"
-                        "${multiValues}"
-                        ${ARGN})
-    add_circuit(${example_target}
-                SOURCES ${ARG_SOURCES}
-
-                LINK_LIBRARIES
-                crypto3::algebra
-                crypto3::block
-                crypto3::codec
-                crypto3::containers
-                crypto3::hash
-                crypto3::kdf
-                crypto3::mac
-                marshalling::core
-                marshalling::crypto3_algebra
-                marshalling::crypto3_multiprecision
-                marshalling::crypto3_zk
-                crypto3::math
-                crypto3::modes
-                crypto3::multiprecision
-                crypto3::passhash
-                crypto3::pbkdf
-                crypto3::threshold
-                crypto3::pkpad
-                crypto3::pubkey
-                crypto3::random
-                crypto3::stream
-                crypto3::vdf
-                crypto3::zk
-
-                ${Boost_LIBRARIES})
-endfunction()
-
-add_example(template SOURCES main.cpp INPUT main.inp)
+#---------------------------------------------------------------------------#
+# Copyright (c) 2018-2023 Mikhail Komarov <[email protected]>
+#
+# Distributed under the Boost Software License, Version 1.0
+# See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt
+#---------------------------------------------------------------------------#
+
+cm_project(template WORKSPACE_NAME ${CMAKE_WORKSPACE_NAME} LANGUAGES C CXX)
+
+list(APPEND ${CURRENT_PROJECT_NAME}_PUBLIC_HEADERS)
+
+list(APPEND ${CURRENT_PROJECT_NAME}_UNGROUPED_SOURCES)
+
+list(APPEND ${CURRENT_PROJECT_NAME}_HEADERS
+     ${${CURRENT_PROJECT_NAME}_PUBLIC_HEADERS})
+
+list(APPEND ${CURRENT_PROJECT_NAME}_SOURCES
+     ${${CURRENT_PROJECT_NAME}_UNGROUPED_SOURCES})
+
+cm_setup_version(VERSION 0.1.0 PREFIX ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME})
+
+add_library(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE)
+
+set_target_properties(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} PROPERTIES
+                      EXPORT_NAME ${CURRENT_PROJECT_NAME})
+
+target_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
+                      crypto3::algebra
+                      crypto3::block
+                      crypto3::codec
+                      crypto3::containers
+                      crypto3::hash
+                      crypto3::kdf
+                      crypto3::mac
+                      marshalling::core
+                      marshalling::crypto3_algebra
+                      marshalling::crypto3_multiprecision
+                      marshalling::crypto3_zk
+                      crypto3::math
+                      crypto3::modes
+                      crypto3::multiprecision
+                      crypto3::passhash
+                      crypto3::pbkdf
+                      crypto3::threshold
+                      crypto3::pkpad
+                      crypto3::pubkey
+                      crypto3::random
+                      crypto3::stream
+                      crypto3::vdf
+                      crypto3::zk
+
+                      ${Boost_LIBRARIES})
+
+target_include_directories(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
+                           $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+                           $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>
+
+                           ${Boost_INCLUDE_DIRS})
+
+cm_deploy(TARGETS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
+          INCLUDE include
+          NAMESPACE ${CMAKE_WORKSPACE_NAME}::)
+
+if(BUILD_TESTS)
+    add_subdirectory(test)
+endif()