diff --git a/.gitignore b/.gitignore index d36a955f..3d41ea4f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ jpeg/jconfig.h jpegturbo/config.h jpegturbo/jconfig.h jpegturbo/jconfigint.h +sdl2/tmp/ diff --git a/CMakeLists.txt b/CMakeLists.txt index ed0c8345..ae3e5119 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,10 +147,12 @@ if(WIN32) BUILD_COMMAND ${OPENSSL_BUILD} INSTALL_COMMAND ${OPENSSL_INSTALL} ) - set(OPENSSD_BUNDLED_INCLUDE_DIR "${OPENSSL_PREFIX}/include") + set(OPENSSL_BUNDLED_INCLUDE_DIR "${OPENSSL_PREFIX}/include") set(OPENSSL_BUNDLED_LIBRARY "${OPENSSL_PREFIX}/lib/libcrypto.lib" "${OPENSSL_PREFIX}/lib/libssl.lib") + set_target_properties(bundled_openssl PROPERTIES FOLDER ${BUNDLED_TARGETS_FOLDER}) else() add_custom_target(bundled_openssl) + set_target_properties(bundled_openssl PROPERTIES FOLDER ${BUNDLED_TARGETS_FOLDER}) endif() #-----------------------------------------------------------------