From beb6d9200d15e8fbaab62b90b9955b0127fc2ba9 Mon Sep 17 00:00:00 2001 From: Ilya Kitaev Date: Fri, 24 Jun 2016 14:49:23 +0300 Subject: CMake: GPL 'libutils' script removed --- src/wallet/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/wallet/CMakeLists.txt') diff --git a/src/wallet/CMakeLists.txt b/src/wallet/CMakeLists.txt index 119d46540..0b8fe4cb1 100644 --- a/src/wallet/CMakeLists.txt +++ b/src/wallet/CMakeLists.txt @@ -26,7 +26,8 @@ # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -include (${PROJECT_SOURCE_DIR}/cmake/libutils.cmake) +# include (${PROJECT_SOURCE_DIR}/cmake/libutils.cmake) +include (${PROJECT_SOURCE_DIR}/cmake/MergeStaticLibs.cmake) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) @@ -76,7 +77,8 @@ target_link_libraries(wallet set(libs_to_merge wallet cryptonote_core mnemonics common crypto) -MERGE_STATIC_LIBS(wallet_merged wallet_merged "${libs_to_merge}") +#MERGE_STATIC_LIBS(wallet_merged wallet_merged "${libs_to_merge}") +merge_static_libs(wallet_merged "${libs_to_merge}") install(TARGETS wallet_merged ARCHIVE DESTINATION lib) -- cgit v1.2.3