From 4261ccd1ad92a94d852a03489911ac57de7205fb Mon Sep 17 00:00:00 2001 From: Levi Neely <141506390+lneely@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:01:35 +0200 Subject: [PATCH] removed mbedtls-1.x from cmakelists --- CMakeLists.txt | 11 +------- lib/mbedtls-2.1.14/CMakeLists.txt | 42 +++++++++++++++---------------- 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f922b5a..88acccc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,23 +15,15 @@ link_directories(${Boost_LIBRARY_DIR}) #set (CMAKE_CXX_FLAGS "-Wl,-Bstatic") set (CMAKE_C_FLAGS "-fPIC -g") set (PCLSYNC_PATH ${CMAKE_SOURCE_DIR}/lib/pclsync) -set (MBEDTLS_PATH ${CMAKE_SOURCE_DIR}/lib/mbedtls-1.3.10) set (MBEDTLS2_PATH ${CMAKE_SOURCE_DIR}/lib/mbedtls-2.1.14) set (CMD_PATH ${CMAKE_SOURCE_DIR}/cmd/pcloudcc) -#add_subdirectory(${MBEDTLS_PATH}) - include_directories(${PCLSYNC_PATH}) add_custom_target( pclsync COMMAND make fs WORKING_DIRECTORY ${PCLSYNC_PATH} ) -add_custom_target( - mbedtls - COMMAND cmake . && make - WORKING_DIRECTORY ${MBEDTLS_PATH} -) add_custom_target( mbedtls2 @@ -46,7 +38,6 @@ add_library(pcloudcc_lib SHARED ${CMD_PATH}/pclsync_lib_c.cpp ${CMD_PATH}/pclsyn target_link_libraries(pcloudcc_lib ${PCLSYNC_PATH}/psynclib.a - ${MBEDTLS_PATH}/build/library/libmbedtls.a ${MBEDTLS2_PATH}/build/library/libmbedcrypto.a ${MBEDTLS2_PATH}/build/library/libmbedx509.a ${MBEDTLS2_PATH}/build/library/libmbedtls.a @@ -63,7 +54,7 @@ target_link_libraries(pcloudcc pcloudcc_lib) target_link_libraries(pcloudcc ${Boost_LIBRARIES}) -link_directories(${PCLSYNC_PATH} ${MBEDTLS_PATH}/build/library ${MBEDTLS2_PATH}/build/library ${OVERLAY_CLENT_PATH}) +link_directories(${PCLSYNC_PATH} ${MBEDTLS2_PATH}/build/library ${OVERLAY_CLENT_PATH}) install(TARGETS pcloudcc RUNTIME DESTINATION bin) install(TARGETS pcloudcc_lib LIBRARY DESTINATION lib) diff --git a/lib/mbedtls-2.1.14/CMakeLists.txt b/lib/mbedtls-2.1.14/CMakeLists.txt index f032ad4..cb63244 100644 --- a/lib/mbedtls-2.1.14/CMakeLists.txt +++ b/lib/mbedtls-2.1.14/CMakeLists.txt @@ -58,38 +58,38 @@ if(CMAKE_COMPILER_IS_GNU) # note: starting with CMake 2.8 we could use CMAKE_C_COMPILER_VERSION execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement -Wwrite-strings") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement -Wwrite-strings -fPIC") if (GCC_VERSION VERSION_GREATER 4.5 OR GCC_VERSION VERSION_EQUAL 4.5) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wlogical-op") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wlogical-op -fPIC") endif() if (GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wshadow -fPIC") endif() - set(CMAKE_C_FLAGS_RELEASE "-O2") - set(CMAKE_C_FLAGS_DEBUG "-O0 -g3") - set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage") - set(CMAKE_C_FLAGS_ASAN "-Werror -fsanitize=address -fno-common -O3") - set(CMAKE_C_FLAGS_ASANDBG "-Werror -fsanitize=address -fno-common -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls ") - set(CMAKE_C_FLAGS_CHECK "-Werror -Os") - set(CMAKE_C_FLAGS_CHECKFULL "${CMAKE_C_FLAGS_CHECK} -Wcast-qual") + set(CMAKE_C_FLAGS_RELEASE "-O2 -fPIC") + set(CMAKE_C_FLAGS_DEBUG "-O0 -g3 -fPIC") + set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage -fPIC") + set(CMAKE_C_FLAGS_ASAN "-Werror -fsanitize=address -fno-common -O3 -fPIC") + set(CMAKE_C_FLAGS_ASANDBG "-Werror -fsanitize=address -fno-common -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fPIC ") + set(CMAKE_C_FLAGS_CHECK "-Werror -Os -fPIC") + set(CMAKE_C_FLAGS_CHECKFULL "${CMAKE_C_FLAGS_CHECK} -Wcast-qual -fPIC") endif(CMAKE_COMPILER_IS_GNU) if(CMAKE_COMPILER_IS_CLANG) execute_process(COMMAND clang --help COMMAND grep fno-sanitize-recover COMMAND grep = RESULT_VARIABLE clang_ver) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow") - set(CMAKE_C_FLAGS_RELEASE "-O2") - set(CMAKE_C_FLAGS_DEBUG "-O0 -g3") - set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith -Wimplicit-fallthrough -Wshadow -fPIC") + set(CMAKE_C_FLAGS_RELEASE "-O2 -fPIC") + set(CMAKE_C_FLAGS_DEBUG "-O0 -g3 -fPIC") + set(CMAKE_C_FLAGS_COVERAGE "-O0 -g3 --coverage -fPIC") if(${clang_ver} EQUAL 0) - set(CMAKE_C_FLAGS_ASAN "-Werror -fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3") - set(CMAKE_C_FLAGS_ASANDBG "-Werror -fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls ") + set(CMAKE_C_FLAGS_ASAN "-Werror -fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O3 -fPIC") + set(CMAKE_C_FLAGS_ASANDBG "-Werror -fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover=all -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fPIC ") else() - set(CMAKE_C_FLAGS_ASAN "-Werror -fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover -O3") - set(CMAKE_C_FLAGS_ASANDBG "-Werror -fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls ") + set(CMAKE_C_FLAGS_ASAN "-Werror -fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover -O3 -fPIC") + set(CMAKE_C_FLAGS_ASANDBG "-Werror -fsanitize=address -fno-common -fsanitize=undefined -fno-sanitize-recover -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fPIC ") endif() - set(CMAKE_C_FLAGS_MEMSAN "-Werror -fsanitize=memory -O3") - set(CMAKE_C_FLAGS_MEMSANDBG "-Werror -fsanitize=memory -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize-memory-track-origins=2") - set(CMAKE_C_FLAGS_CHECK "-Werror -Os") + set(CMAKE_C_FLAGS_MEMSAN "-Werror -fsanitize=memory -O3 -fPIC") + set(CMAKE_C_FLAGS_MEMSANDBG "-Werror -fsanitize=memory -O1 -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize-memory-track-origins=2 -fPIC") + set(CMAKE_C_FLAGS_CHECK "-Werror -Os -fPIC") endif(CMAKE_COMPILER_IS_CLANG) if(CMAKE_COMPILER_IS_IAR)