diff --git a/CMakeLists.txt b/CMakeLists.txt index 6138e10..af2d79b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,17 +18,17 @@ project(glitchedhttps C) set(CMAKE_C_STANDARD 11) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake" ${CMAKE_MODULE_PATH}) +if (WIN32 AND BUILD_SHARED_LIBS) + set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) +endif () + option(GLITCHEDHTTPS_ENABLE_TESTS "Build GlitchedHTTPS tests." OFF) option(GLITCHEDHTTPS_ENABLE_EXAMPLES "Build GlitchedHTTPS example programs." OFF) option(ENABLE_TESTING "Build MbedTLS tests." OFF) option(ENABLE_PROGRAMS "Build MbedTLS example programs." OFF) -if (WIN32 AND BUILD_SHARED_LIBS) - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) -endif () - -add_subdirectory(lib/mbedtls) +add_subdirectory(lib/mbedtls mbedtls) set(glitchedhttps_headers lib/chillbuff/include/chillbuff.h diff --git a/run-tests.sh b/run-tests.sh index 7cc3421..5af6efc 100644 --- a/run-tests.sh +++ b/run-tests.sh @@ -1,19 +1,4 @@ #!/bin/sh - -# Copyright 2020 Raphael Beck -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - REPO=$(dirname "$0") rm -rf $REPO/build/ mkdir build && cd build