From 04d43c09ecc05e66294b92f77742f9ada75ac5b3 Mon Sep 17 00:00:00 2001 From: Yi Zhang Date: Wed, 14 Apr 2021 20:19:48 +0800 Subject: [PATCH] update library --- src/CMakeLists.txt | 14 ++++++++------ src/cwt.c | 0 src/cwt.h | 0 src/cwtmath.c | 0 src/cwtmath.h | 0 src/wavefunc.c | 0 src/wavefunc.h | 0 7 files changed, 8 insertions(+), 6 deletions(-) mode change 100755 => 100644 src/cwt.c mode change 100755 => 100644 src/cwt.h mode change 100755 => 100644 src/cwtmath.c mode change 100755 => 100644 src/cwtmath.h mode change 100755 => 100644 src/wavefunc.c mode change 100755 => 100644 src/wavefunc.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8948c60..cdf1a6f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,16 +23,18 @@ set(HEADER_FILES conv.h wtmath.h ) -add_library(wavelib STATIC ${SOURCE_FILES} ${HEADER_FILES}) +#add_library(wavelib STATIC ${SOURCE_FILES} ${HEADER_FILES}) -#add_library(wavelib SHARED ${SOURCE_FILES} ${HEADER_FILES}) +set(CMAKE_MACOSX_RPATH 1) + +add_library(wavelib SHARED ${SOURCE_FILES} ${HEADER_FILES}) # 首先添加静态库的生成命令 -#add_library(wavelib_static STATIC ${SOURCE_FILES} ${HEADER_FILES}) +add_library(wavelib_static STATIC ${SOURCE_FILES} ${HEADER_FILES}) # 设置静态库的输出名称从而获得与动态库名称相同的静态库 -#set_target_properties(wavelib_static PROPERTIES OUTPUT_NAME "wavelib") +set_target_properties(wavelib_static PROPERTIES OUTPUT_NAME "wavelib") # 设置输出目标属性以同时输出动态库与静态库 -#set_target_properties(wavelib PROPERTIES CLEAN_DIRECT_OUTPUT 1) -#set_target_properties(wavelib_static PROPERTIES CLEAN_DIRECT_OUTPUT 1) +set_target_properties(wavelib PROPERTIES CLEAN_DIRECT_OUTPUT 1) +set_target_properties(wavelib_static PROPERTIES CLEAN_DIRECT_OUTPUT 1) include(CheckSymbolExists) diff --git a/src/cwt.c b/src/cwt.c old mode 100755 new mode 100644 diff --git a/src/cwt.h b/src/cwt.h old mode 100755 new mode 100644 diff --git a/src/cwtmath.c b/src/cwtmath.c old mode 100755 new mode 100644 diff --git a/src/cwtmath.h b/src/cwtmath.h old mode 100755 new mode 100644 diff --git a/src/wavefunc.c b/src/wavefunc.c old mode 100755 new mode 100644 diff --git a/src/wavefunc.h b/src/wavefunc.h old mode 100755 new mode 100644