diff --git a/.gitignore b/.gitignore index 7d759ae..c85e6eb 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ language.settings.xml #wavelib-specific denoised.txt +test/ build/ .DS_Store test/ \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index bab84cd..9dcbec2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,58 +1,25 @@ -cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.15.2) -set(PROJECT_NAME wavelib) -project(${PROJECT_NAME} C) +# 设置工程名称和语言 +project(WAVELIB) -include(GNUInstallDirs) - -# src root path -set(WAVELIB_SRC_ROOT ${PROJECT_SOURCE_DIR} CACHE PATH "Wavelib source root") -# binary output by default -set(COMMON_BIN_PATH ${CMAKE_BINARY_DIR}/Bin) -set(LIBRARY_OUTPUT_PATH ${COMMON_BIN_PATH}/${CMAKE_BUILD_TYPE}) -set(EXECUTABLE_OUTPUT_PATH ${COMMON_BIN_PATH}/${CMAKE_BUILD_TYPE}) -# set where to find additional cmake modules if any -set(CMAKE_MODULE_PATH ${WAVELIB_SRC_ROOT}/cmake ${CMAKE_MODULE_PATH}) - - -set(WAVELIB_VERSION "1.0.0" CACHE STRING "Wavelib version" FORCE) -message(">>> Building Wavelib version: ${WAVELIB_VERSION}") -message(">>> EXECUTABLE_OUTPUT_PATH = ${EXECUTABLE_OUTPUT_PATH}") - -option(BUILD_UT "Enable Unit test" ON) - -# cleanup prefix lib for Unix-like OSes -set(CMAKE_SHARED_MODULE_PREFIX) - -# 设置安装地址（通过homebrew安装时需要注释掉） -set(CMAKE_INSTALL_PREFIX /usr/local) - -# install target to this folder by default -#set(WAVELIB_BINARY_DIR ${WAVELIB_SRC_ROOT}/bin) -#if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -# set(CMAKE_INSTALL_PREFIX "${WAVELIB_BINARY_DIR}" CACHE PATH "default install path" FORCE) -#endif() - -# make include globaly visible -set(PROJECT_WIDE_INCLUDE ${WAVELIB_SRC_ROOT}/header) -include_directories(${PROJECT_WIDE_INCLUDE}) - - - - -include_directories(${COMMON_BIN_PATH}) - -if(BUILD_UT) - include(CTest) - enable_testing() - enable_language(CXX) - add_subdirectory(unitTests) +if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux") + message(STATUS "Platform: " ${CMAKE_HOST_SYSTEM_NAME}) + set(CMAKE_INSTALL_PREFIX "/usr/local") +elseif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") + message(STATUS "Platform: " ${CMAKE_HOST_SYSTEM_NAME}) + set(CMAKE_INSTALL_PREFIX "/usr/local") +elseif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") + message(STATUS "Platform: " ${CMAKE_HOST_SYSTEM_NAME}) + set(CMAKE_C_COMPILER gcc) + set(CMAKE_CXX_COMPILER g++) + set(CMAKE_INSTALL_PREFIX "D:/Library") +else() + message(STATUS "Platform: " ${CMAKE_HOST_SYSTEM_NAME}) + set(CMAKE_INSTALL_PREFIX "/usr/local") endif() +message(STATUS "Install prefix: " ${CMAKE_INSTALL_PREFIX}) +# 添加源文件地址 add_subdirectory(src) -add_subdirectory(auxiliary) -add_subdirectory(test) - -install(DIRECTORY ${WAVELIB_SRC_ROOT}/header/ - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING PATTERN "*.h") +add_subdirectory(auxiliary) \ No newline at end of file diff --git a/auxiliary/CMakeLists.txt b/auxiliary/CMakeLists.txt index 1da2c08..5c6186c 100644 --- a/auxiliary/CMakeLists.txt +++ b/auxiliary/CMakeLists.txt @@ -1,20 +1,35 @@ -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +# 设定源文件文件夹 +aux_source_directory(. WAUX_SRC) -set(SOURCE_FILES denoise.c - waux.c -) +# 以下部分为库的编译 +# 注意目标名必须唯一 所以不能直接生成相同名称的动态库与静态库 +# 注意此处不必为目标名称添加lib前缀和相应后缀，cmake会自行添加 +add_library(wauxlib SHARED ${WAUX_SRC}) +# 首先添加静态库的生成命令 +add_library(wauxlib_static STATIC ${WAUX_SRC}) +# 设置静态库的输出名称从而获得与动态库名称相同的静态库 +set_target_properties(wauxlib_static PROPERTIES OUTPUT_NAME "wauxlib") +# 设置输出目标属性以同时输出动态库与静态库 +set_target_properties(wauxlib PROPERTIES CLEAN_DIRECT_OUTPUT 1) +set_target_properties(wauxlib_static PROPERTIES CLEAN_DIRECT_OUTPUT 1) +# 设置动态库的版本号 +set_target_properties(wauxlib PROPERTIES VERSION 1.0 SOVERSION 1.0) -set(HEADER_FILES waux.h) +target_link_libraries(wauxlib PUBLIC wavelib) +target_link_libraries(wauxlib_static PUBLIC wavelib_static) -add_library(wauxlib STATIC ${SOURCE_FILES} ${HEADER_FILES}) +# 设置库文件的输出地址 +set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) -target_link_libraries(wauxlib wavelib) +# 设置编译选项 +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2") -set_property(TARGET wauxlib PROPERTY FOLDER "lib") - -target_include_directories(wauxlib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) - -install(TARGETS wauxlib - EXPORT wavelib-targets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +# 库的安装命令 +if(WIN32) + install(TARGETS wauxlib DESTINATION lib) + install(TARGETS wauxlib_static DESTINATION lib) +else() + install(TARGETS wauxlib wauxlib_static + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) +endif() \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8948c60..8020e90 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,70 +1,34 @@ +# 设定源文件文件夹 +aux_source_directory(. WAVE_SRC) - -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - -set(SOURCE_FILES conv.c - cwt.c - cwtmath.c - hsfft.c - real.c - wavefilt.c - wavefunc.c - wavelib.c - wtmath.c - ) - -set(HEADER_FILES conv.h - cwt.h - cwtmath.h - hsfft.h - real.h - wavefilt.h - wavefunc.h - wtmath.h - ) - -add_library(wavelib STATIC ${SOURCE_FILES} ${HEADER_FILES}) - -#add_library(wavelib SHARED ${SOURCE_FILES} ${HEADER_FILES}) +# 以下部分为库的编译 +# 注意目标名必须唯一 所以不能直接生成相同名称的动态库与静态库 +# 注意此处不必为目标名称添加lib前缀和相应后缀，cmake会自行添加 +add_library(wavelib SHARED ${WAVE_SRC}) # 首先添加静态库的生成命令 -#add_library(wavelib_static STATIC ${SOURCE_FILES} ${HEADER_FILES}) +add_library(wavelib_static STATIC ${WAVE_SRC}) # 设置静态库的输出名称从而获得与动态库名称相同的静态库 -#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) +# 设置动态库的版本号 +set_target_properties(wavelib PROPERTIES VERSION 1.0 SOVERSION 1.0) +# 设置库文件的输出地址 +set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib) -include(CheckSymbolExists) +# 设置编译选项 +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2") -# https://stackoverflow.com/questions/32816646/can-cmake-detect-if-i-need-to-link-to-libm-when-using-pow-in-c -if(NOT POW_FUNCTION_EXISTS AND NOT NEED_LINKING_AGAINST_LIBM) - check_symbol_exists(pow "math.h" POW_FUNCTION_EXISTS) - if(NOT POW_FUNCTION_EXISTS) - unset(POW_FUNCTION_EXISTS CACHE) - list(APPEND CMAKE_REQUIRED_LIBRARIES m) - check_symbol_exists(pow "math.h" POW_FUNCTION_EXISTS) - if(POW_FUNCTION_EXISTS) - set(NEED_LINKING_AGAINST_LIBM True CACHE BOOL "" FORCE) - else() - message(FATAL_ERROR "Failed making the pow() function available") - endif() - endif() +# 库的安装命令 +if(WIN32) + install(TARGETS wavelib DESTINATION lib) + install(TARGETS wavelib_static DESTINATION lib) +else() + install(TARGETS wavelib wavelib_static + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) endif() - -if(NEED_LINKING_AGAINST_LIBM) - target_link_libraries(wavelib PUBLIC m) -endif() - -set_property(TARGET wavelib PROPERTY FOLDER "lib") - -target_include_directories(wavelib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}../header) - -install(TARGETS wavelib - EXPORT wavelib-targets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - -install(EXPORT wavelib-targets - FILE wavelib-config.cmake - NAMESPACE wavelib:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wavelib) +# 头文件安装命令 +install(FILES ../header/wavelib.h DESTINATION include) +install(FILES ../header/wauxlib.h DESTINATION include) \ No newline at end of file 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 diff --git a/test/cwttest b/test/cwttest deleted file mode 100755 index ffe251a..0000000 Binary files a/test/cwttest and /dev/null differ diff --git a/test/denoisetest b/test/denoisetest deleted file mode 100755 index e5cb71b..0000000 Binary files a/test/denoisetest and /dev/null differ diff --git a/test/dwpttest b/test/dwpttest deleted file mode 100755 index 707dee2..0000000 Binary files a/test/dwpttest and /dev/null differ diff --git a/test/dwt2test b/test/dwt2test deleted file mode 100755 index 3590098..0000000 Binary files a/test/dwt2test and /dev/null differ diff --git a/test/dwt2test.c b/test/dwt2test.c old mode 100755 new mode 100644 diff --git a/test/dwttest b/test/dwttest deleted file mode 100755 index f984b8f..0000000 Binary files a/test/dwttest and /dev/null differ diff --git a/test/modwt2test b/test/modwt2test deleted file mode 100755 index 9850b6e..0000000 Binary files a/test/modwt2test and /dev/null differ diff --git a/test/modwt2test.c b/test/modwt2test.c old mode 100755 new mode 100644 diff --git a/test/modwtdenoisetest b/test/modwtdenoisetest deleted file mode 100755 index f369d59..0000000 Binary files a/test/modwtdenoisetest and /dev/null differ diff --git a/test/modwtdenoisetest.c b/test/modwtdenoisetest.c old mode 100755 new mode 100644 diff --git a/test/modwttest b/test/modwttest deleted file mode 100755 index aea832a..0000000 Binary files a/test/modwttest and /dev/null differ diff --git a/test/sst_nino3.dat b/test/sst_nino3.dat old mode 100755 new mode 100644 diff --git a/test/swt2test b/test/swt2test deleted file mode 100755 index 5327454..0000000 Binary files a/test/swt2test and /dev/null differ diff --git a/test/swt2test.c b/test/swt2test.c old mode 100755 new mode 100644 diff --git a/test/swttest b/test/swttest deleted file mode 100755 index adfd96f..0000000 Binary files a/test/swttest and /dev/null differ diff --git a/test/wtreetest b/test/wtreetest deleted file mode 100755 index 07842b5..0000000 Binary files a/test/wtreetest and /dev/null differ