Fix contracts installation after add_contract #258

cyberway · Jan 31, 2020 · 488ff67 · 488ff67
1 parent 6f4a316
commit 488ff67
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,11 +30,15 @@ else()
    set(TEST_BUILD_TYPE ${CMAKE_BUILD_TYPE})
 endif()
 
+macro(install_contract TARGET)
+   install (TARGETS ${TARGET}.wasm DESTINATION ${CMAKE_INSTALL_PREFIX}/${TARGET}/)
+   install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.abi DESTINATION ${CMAKE_INSTALL_PREFIX}/${TARGET}/)
+endmacro()
+
 macro(add_contract_with_abi TARGET ABIFILE)
    add_executable( ${TARGET}.wasm ${ARGN} )
    configure_file(${ABIFILE} ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.abi COPYONLY)
-   install (TARGETS ${TARGET}.wasm DESTINATION ${CMAKE_INSTALL_PREFIX}/${TARGET}/)
-   install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}.abi DESTINATION ${CMAKE_INSTALL_PREFIX}/${TARGET}/)
+   install_contract(TARGET)
 endmacro()
 
 add_subdirectory(cyber.bios)

diff --git a/cyber.bios/CMakeLists.txt b/cyber.bios/CMakeLists.txt
@@ -1,4 +1,6 @@
 add_contract(cyber.bios cyber.bios ${CMAKE_CURRENT_SOURCE_DIR}/src/cyber.bios.cpp)
+install_contract(cyber.bios)
+
 target_include_directories(cyber.bios.wasm
    PUBLIC
    ${CMAKE_CURRENT_SOURCE_DIR}/../cyber.govern/include

diff --git a/cyber.domain/CMakeLists.txt b/cyber.domain/CMakeLists.txt
@@ -1,4 +1,6 @@
 add_contract(cyber.domain cyber.domain ${CMAKE_CURRENT_SOURCE_DIR}/cyber.domain.cpp)
+install_contract(cyber.domain)
+
 target_include_directories(cyber.domain.wasm
    PUBLIC
    ${CMAKE_CURRENT_SOURCE_DIR}/../cyber.token/include
@@ -7,6 +9,3 @@ target_include_directories(cyber.domain.wasm
 set_target_properties(cyber.domain.wasm
    PROPERTIES
    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-
-install (TARGETS cyber.domain.wasm DESTINATION ${CMAKE_INSTALL_PREFIX}/cyber.domain/)
-#install (FILES ${CMAKE_CURRENT_BINARY_DIR}/cyber.domain.abi DESTINATION ${CMAKE_INSTALL_PREFIX}/cyber.domain/)
diff --git a/cyber.govern/CMakeLists.txt b/cyber.govern/CMakeLists.txt
@@ -1,4 +1,6 @@
 add_contract(cyber.govern cyber.govern ${CMAKE_CURRENT_SOURCE_DIR}/src/cyber.govern.cpp)
+install_contract(cyber.govern)
+
 target_include_directories(cyber.govern.wasm
    PUBLIC
    ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -9,6 +11,3 @@ target_include_directories(cyber.govern.wasm
 set_target_properties(cyber.govern.wasm
    PROPERTIES
    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-
-install (TARGETS cyber.govern.wasm DESTINATION ${CMAKE_INSTALL_PREFIX}/cyber.govern/)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/cyber.govern.abi DESTINATION ${CMAKE_INSTALL_PREFIX}/cyber.govern/)
diff --git a/cyber.incomereject/CMakeLists.txt b/cyber.incomereject/CMakeLists.txt
@@ -1,4 +1,6 @@
 add_contract(cyber.incomereject cyber.incomereject ${CMAKE_CURRENT_SOURCE_DIR}/src/cyber.incomereject.cpp)
+install_contract(cyber.incomereject)
+
 target_include_directories(cyber.incomereject.wasm
    PUBLIC 
    ${CMAKE_CURRENT_SOURCE_DIR}/include

diff --git a/cyber.msig/CMakeLists.txt b/cyber.msig/CMakeLists.txt
@@ -1,4 +1,6 @@
 add_contract(cyber.msig cyber.msig ${CMAKE_CURRENT_SOURCE_DIR}/src/cyber.msig.cpp)
+install_contract(cyber.msig)
+
 target_include_directories(cyber.msig.wasm
    PUBLIC 
    ${CMAKE_CURRENT_SOURCE_DIR}/include)

diff --git a/cyber.rejector/CMakeLists.txt b/cyber.rejector/CMakeLists.txt
@@ -1,4 +1,6 @@
 add_contract(cyber.rejector cyber.rejector ${CMAKE_CURRENT_SOURCE_DIR}/src/cyber.rejector.cpp)
+install_contract(cyber.rejector)
+
 target_include_directories(cyber.rejector.wasm
    PUBLIC 
    ${CMAKE_CURRENT_SOURCE_DIR}/include)

diff --git a/cyber.stake/CMakeLists.txt b/cyber.stake/CMakeLists.txt
@@ -1,4 +1,6 @@
 add_contract(cyber.stake cyber.stake ${CMAKE_CURRENT_SOURCE_DIR}/src/cyber.stake.cpp)
+install_contract(cyber.stake)
+
 target_include_directories(cyber.stake.wasm
    PUBLIC 
    ${CMAKE_CURRENT_SOURCE_DIR}/include

diff --git a/cyber.token/CMakeLists.txt b/cyber.token/CMakeLists.txt
@@ -1,4 +1,6 @@
 add_contract(cyber.token cyber.token ${CMAKE_CURRENT_SOURCE_DIR}/src/cyber.token.cpp)
+install_contract(cyber.token)
+
 target_include_directories(cyber.token.wasm
    PUBLIC 
    ${CMAKE_CURRENT_SOURCE_DIR}/include)