diff --git a/.gitignore b/.gitignore index 1599003..202ffb4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,6 @@ bin -ext/pugixml/bin -ext/pugixml/trunk -ext/sparsehash .mkn bin -conanbuildinfo.txt -conaninfo.txt +conan* +build +deactivate* diff --git a/conanfile.txt b/conanfile.txt index 35285f5..bab4b2c 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,2 +1,7 @@ [requires] openssl/3.2.2 +[generators] +CMakeDeps +CMakeToolchain +[layout] +cmake_layout diff --git a/mkn.yaml b/mkn.yaml index 57cc5dc..b9dcc76 100644 --- a/mkn.yaml +++ b/mkn.yaml @@ -30,25 +30,27 @@ profile: if_lib: nix: ssl crypto bsd: ssl crypto - win: User32 Crypt32 libssl libcrypto + win: User32 Crypt32 libssl libcrypto zlib + if_link: + win_cl: -nodefaultlib:libucrt.lib ucrt.lib - name: fcgi parent: lib arg: -D_KUL_INCLUDE_FCGI_ - name: usage - self: https + parent: https main: test/usage.cpp - arg: -D_MKN_RAM_INCLUDE_HTTPS_ - if_link: - win_cl: -nodefaultlib:libucrt.lib ucrt.lib + # arg: -D_MKN_RAM_INCLUDE_HTTPS_ + # if_link: + # win_cl: -nodefaultlib:libucrt.lib ucrt.lib - name: test_fcgi main: test/fcgi.cpp self: fcgi - name: test - self: https + parent: https mode: none main: test/test.cpp diff --git a/test/test.cpp b/test/test.cpp index 35475bc..436fc74 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -28,7 +28,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. */ -#define _MKN_RAM_INCLUDE_HTTPS_ +// #define _MKN_RAM_INCLUDE_HTTPS_ #define __MKN_RAM_NOMAIN__ #include "usage.cpp" class TestHTTPSServer : public mkn::ram::https::Server {