diff options
| author | Ilya Kitaev <mbg033@gmail.com> | 2016-06-24 14:49:23 +0300 |
|---|---|---|
| committer | Ilya Kitaev <mbg033@gmail.com> | 2016-06-24 14:49:23 +0300 |
| commit | beb6d9200d15e8fbaab62b90b9955b0127fc2ba9 (patch) | |
| tree | f60b803315a789d3674e393ffca2f5b4397bd0a5 /src | |
| parent | Merge branch 'master' of https://github.com/mbg033/bitmonero (diff) | |
| download | monero-beb6d9200d15e8fbaab62b90b9955b0127fc2ba9.tar.xz | |
CMake: GPL 'libutils' script removed
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
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) |