Skip to content

Commit

Permalink
🔥 Removed conan package
Browse files Browse the repository at this point in the history
  • Loading branch information
AnotherFoxGuy committed Aug 4, 2021
1 parent f209452 commit 8927090
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 143 deletions.
37 changes: 0 additions & 37 deletions .travis.yml

This file was deleted.

25 changes: 0 additions & 25 deletions .travis/install.sh

This file was deleted.

13 changes: 0 additions & 13 deletions .travis/run.sh

This file was deleted.

11 changes: 2 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@ project(SocketW)
if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
# For some reason Conans libcxx will break the build
set(CONAN_LIBCXX "")
conan_basic_setup(TARGETS)
conan_define_targets()
else()
find_package(OpenSSL REQUIRED)
endif()

# some versioning things
SET(LIB_MAJOR_VERSION "3")
SET(LIB_MINOR_VERSION "10")
SET(LIB_BUILD_VERSION "26" CACHE STRING "build version")
SET(LIB_BUILD_VERSION "27" CACHE STRING "build version")
SET(LIB_VERSION "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_BUILD_VERSION}")
IF (NOT DEFINED LIB_INSTALL_DIR)
SET(LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
Expand Down Expand Up @@ -66,12 +65,6 @@ ENDIF (UNIX)
IF (LINUX)
SET(CPACK_GENERATOR ${CPACK_GENERATOR};DEB;RPM)
ENDIF (LINUX)
IF (MSVC)
SET(CPACK_GENERATOR ${CPACK_GENERATOR};NSIS)
ENDIF (MSVC)
IF (APPLE)
SET(CPACK_GENERATOR ${CPACK_GENERATOR};PackageMaker)
ENDIF (APPLE)
SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${LIB_VERSION}-${CMAKE_SYSTEM_PROCESSOR}")

IF (LINUX_VERSION)
Expand Down
23 changes: 0 additions & 23 deletions appveyor.yml

This file was deleted.

8 changes: 0 additions & 8 deletions build.py

This file was deleted.

28 changes: 0 additions & 28 deletions conanfile.py

This file was deleted.

0 comments on commit 8927090

Please sign in to comment.