conan support

Author: cen1

.gitignore

@@ -35,3 +35,8 @@ Release/
 Thumbs.db
 build/
 cmake_install.cmake
+Findmpir.cmake
+conan.lock
+conanbuildinfo.txt
+conaninfo.txt
+graph_info.json

CMake/Modules/FindMPIR.cmake

@@ -1,5 +1,8 @@
 project(bncsutil)
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.2)
+
+set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} "${PROJECT_SOURCE_DIR}/CMake/Modules")
+message(${CMAKE_BINARY_DIR})
 
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "4")
@@ -12,18 +15,20 @@ file(GLOB SOURCE
 file(GLOB HEADERS
     "src/bncsutil/*.h"
 )
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake/Modules)
 
-add_library(${PROJECT_NAME} SHARED ${SOURCE} ${HEADERS})
-add_library(${PROJECT_NAME}_static STATIC ${SOURCE} ${HEADERS})
+add_library(${PROJECT_NAME} ${SOURCE} ${HEADERS})
+
+if (WIN32)
+    set(USE_GMP 0)
+endif()
 
-if (BUILD_32)
+if (CMAKE_GENERATOR_PLATFORM EQUAL "x86")
     set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
     MESSAGE(STATUS "Excluding 64bit library paths from search.")
     set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
     set(ARCH_DEB i386)
     set(ARCH_RPM i686)
-elseif (BUILD_64)
+elseif (CMAKE_GENERATOR_PLATFORM EQUAL "x64")
     set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64")
     set(ARCH_DEB amd64)
     set(ARCH_RPM x86_64)
@@ -32,15 +37,21 @@ else()
     set(ARCH_RPM x86_64)
 endif()
 
-if (USE_MPIR)
-    find_package(MPIR REQUIRED)
-    include_directories(src ${MPIR_INCLUDE_DIR})
-    target_link_libraries(${PROJECT_NAME} ${MPIR_LIBRARIES})
-    add_definitions(-DUSE_MPIR=1)
-else()
+if (USE_SYSTEM_LIBS)
     find_package(GMP REQUIRED)
     include_directories(src ${GMP_INCLUDE_DIR})
     target_link_libraries(${PROJECT_NAME} ${GMP_LIBRARIES})
+else()
+    if (USE_GMP)
+        find_package(gmp REQUIRED)
+        target_include_directories(${PROJECT_NAME} PRIVATE src gmp:gmp)
+        target_link_libraries(${PROJECT_NAME} PRIVATE gmp:gmp)
+    else()
+        find_package(mpir REQUIRED)
+        target_include_directories(${PROJECT_NAME} PRIVATE src mpir::mpir)
+        target_link_libraries(${PROJECT_NAME} PRIVATE mpir::mpir)
+        add_definitions(-DUSE_MPIR=1)
+    endif()
 endif()
 
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME bncsutil)
@@ -54,8 +65,11 @@ if(UNIX)
 endif()
 
 if (WIN32)
-	add_definitions(-D_CRT_SECURE_NO_WARNINGS -DMUTIL_LIB_BUILD=1)
-    target_link_libraries(${PROJECT_NAME} Version.lib)
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS -DMUTIL_LIB_BUILD)
+endif()
+
+if (MSVC)
+	set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT "bncsutil")
 endif()
 
 install(TARGETS bncsutil RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)

CMakeLists.txt

@@ -12,30 +12,53 @@ been maintained over the course of several years by the open source Battle.net c
 ## Usage
 Add `bncsutil.h` to your include directory and link against `bncsutil.lib` or `libbncsutil.so`.
 
-## Building
-CMake is used to generate platform specific build files. The only external dependency is GMP (The GNU Multiple Precision Arithmetic Library ).
-It can be installed with a package manager from any major Linux distro. Debian example: `sudo apt-get install libgmp10`. To force a specific build (32bit or 64bit) build add `-DBUILD_32=1` or `-DBUILD_64=1` to CMake flags. CMake will not warn you if you are missing 32bit glibc and GMP, you must install them manually first (CentOS/Fedora: `glibc-devel.i686` and `gmp-devel.i686`).
+## Building with conan and CMake
+Conan will automatically install mpir on Windows and gmp on non-Windows platforms.
 
-### Windows
+To force a specific build (32bit or 64bit) add `-DCMAKE_GENERATOR_PLATFORM=x86` or `-DCMAKE_GENERATOR_PLATFORM=x64` to CMake flags. 
 
-#### GMP
-If you are using an older toolchain like VS 2005 or 2008, the GMP lib and header file are already included for you in `depends/include` and `depends/lib`. You can skip this step.
-For newer versions of Visual Studio we recommend to use MPIR library instead which is a drop-in replacement for GMP with better Windows support.
- 1. Go to http://mpir.org/ and download the latest source archive.
- 2. Open the VS solution file depending on which version you use, for example build.vc14 for VS 2015.
- 3. Make a Release build of `lib_mpir_gc` project. This produces `mpir.lib` and `mpir.h` in `build.vc14\lib_mpir_gc\Win32\Release`. Copy the header file to `depends/include` and library to `depends/lib`.
+### Windows Visual Studio 2019
 
-#### VS build
- 1. In root bncsutil folder run `cmake -G "Visual Studio 14 2015" -B./build -H./` if you used GMP or `cmake -G "Visual Studio 14 2015" -B./build -H./ -DUSE_MPIR=1`  if you used MPIR in previous step. Change the Visual Studio version as needed.
- 2. CMake will generate sln file in ./build. Open it and build the library.
+Static
+```
+conan install . -if ./build -s compiler.version=16 -s arch=x86_64 -o *:shared=False
+cmake -G "Visual Studio 16 2019" -B./build -DBUILD_SHARED_LIBS=0 -DCMAKE_GENERATOR_PLATFORM=Win32
+```
+
+Shared
+```
+conan install . -if ./build -s compiler.version=16 -s arch=x86_64 -o *:shared=True
+cmake -G "Visual Studio 16 2019" -B./build -DBUILD_SHARED_LIBS=1 -DCMAKE_GENERATOR_PLATFORM=x64
+```
+
+### Windows Visual Studio 2015
+
+Shared
+```
+conan install . -if ./build -s compiler.version=14 -s arch=x86_64 -o *:shared=True
+cmake -G "Visual Studio 14 2015" -B./build -DBUILD_SHARED_LIBS=1 -DCMAKE_GENERATOR_PLATFORM=x64
+```
+
+
+Open `.sln` in `build` directory and build from Visual Studio.
 
 ### Linux
- 1. Install GMP with the package manager. Also install all the necessary development tools (gcc, make or build-essential package on Debian).
- 2. Run `cmake -G "Unix Makefiles" -B./build -H./`
- 3. `cd build && make && make install`
+```
+conan install . -if ./build
+cmake -G "Unix Makefiles" -B./build
+cd build && make && make install
+```
+
+## Building using system dependencies
+Instead of using conan you can link against system provided gmp. Install `libgmp-dev` on deb distros or `gmp-devel` on rpm distros. For 32bit builds, CMake will not warn you if you are missing 32bit glibc and GMP, you must install them manually first (CentOS/Fedora: `glibc-devel.i686` and `gmp-devel.i686`).
+
+```
+cmake -G "Unix Makefiles" -B./build
+cd build && make && make install
+```
 
 ## Building .deb and .rpm packages
-After invoking cmake, cd to build folder and generate them with `cpack -G "DEB"` and `cpack -G "RPM"`.
+After invoking CMake, cd to build folder and generate them with `cpack -G "DEB"` and `cpack -G "RPM"`.
 You can then use `gdebi` to do a local install of .deb with automatic dependency resolution or `yum localinstall` on rpm distros. For dnf it's just `dnf install <name>.rpm`.
 
 ## Hosted Linux repositories

README.md

@@ -0,0 +1,11 @@
+from conans import ConanFile, CMake
+
+class Bncsutil(ConanFile):
+    settings = "os", "compiler", "build_type", "arch"
+    generators = "cmake_find_package"
+
+    def requirements(self):
+        if self.settings.os == "Windows":
+            self.requires("mpir/3.0.0")
+        else:
+            self.requires("gmp/6.2.0")