diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..81631c6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/bin +/build diff --git a/CMakeLists.txt b/CMakeLists.txt index 8007b77..89bac31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ endif() if(MSVC_VERSION EQUAL 1900 AND MSVC_IDE) set(CMAKE_GENERATOR_TOOLSET "v140_xp" CACHE STRING "Name of generator toolset." FORCE) endif() -if(MSVC_VERSION EQUAL 1910 AND MSVC_IDE) +if(MSVC_VERSION GREATER 1909 AND MSVC_VERSION LESS 1920 AND MSVC_IDE) set(CMAKE_GENERATOR_TOOLSET "v141_xp" CACHE STRING "Name of generator toolset." FORCE) endif() if(MSVC_VERSION GREATER 1600 AND NOT MSVC_IDE) @@ -24,7 +24,7 @@ if(APPLE) endif() set(CTPKTOOL_MAJOR 1) set(CTPKTOOL_MINOR 1) -set(CTPKTOOL_PATCHLEVEL 0) +set(CTPKTOOL_PATCHLEVEL 1) if(NOT MSVC_IDE AND NOT XCODE_VERSION AND NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) endif() diff --git a/README.md b/README.md index f5607b1..7abb9a0 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ A tool for exporting/importing ctpk file. ## History - v1.1.0 @ 2018.01.04 - A new beginning +- v1.1.1 @ 2018.07.27 - Update cmake ### v1.0 @@ -30,16 +31,16 @@ A tool for exporting/importing ctpk file. - make 64-bit version ~~~ -mkdir project -cd project +mkdir build +cd build cmake -DUSE_DEP=OFF .. make ~~~ - make 32-bit version ~~~ -mkdir project -cd project +mkdir build +cd build cmake -DBUILD64=OFF -DUSE_DEP=OFF .. make ~~~