Skip to content

Commit

Permalink
Added ability to use dev-conanfile.txt during project generation
Browse files Browse the repository at this point in the history
  • Loading branch information
Pancir committed Sep 7, 2018
1 parent d7ec93e commit a9abfa6
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ output/
output-dev/
output-release/
set-conan-user.bat
dev-conanfile.txt
11 changes: 9 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,20 @@ message(STATUS "==============================================")
# conan.io this must be after options.

include(StsConan)
conan_cmake_run(CONANFILE conanfile.txt
set(INTERNAL_CONAN_FILE conanfile.txt)
set(INTERNAL_CONAN_DEV_FILE dev-conanfile.txt)
if (EXISTS "${CMAKE_SOURCE_DIR}/${INTERNAL_CONAN_DEV_FILE}")
set(INTERNAL_CONAN_FILE ${INTERNAL_CONAN_DEV_FILE})
message(STATUS "Used Conan dev file = ${INTERNAL_CONAN_FILE}")
message(STATUS "==============================================")
endif()
conan_cmake_run(CONANFILE ${INTERNAL_CONAN_FILE}
BASIC_SETUP CMAKE_TARGETS KEEP_RPATHS
BUILD outdated)

#----------------------------------------------------------------------------------#
#//////////////////////////////////////////////////////////////////////////////////#
#----------------------------------------------------------------------------------#
#----------------------------------------------------------------------------------#
# help targets

add_custom_target("Clean-Install-Dir"
Expand Down
5 changes: 4 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ Importing is still under developing and doesn't work properly!
...
```
- If you are going to develop you may generate the `Visual Studio 2017` project with the file `msvc-2017.bat` in the root repository folder.
You also may copy that file and make necessary changes as you wish using the origin script as the example.
You may copy that file and make necessary changes as you wish using the origin script as the example.
You may copy `conanfile.txt` and name it as `dev-conanfile.txt` then this file will be used during project generation.
It is useful when you are developing only for certaing 3Ds Max versions but you want all the versions to be built with your CI.
**Don't forget to update data** in the `dev-conanfile.txt` when you have pull new changes from the repository because dependencies' versions could be changed.
- If you just want to build the plugins you may use the scripts inside the `ci` folder.
Pay attention those scripts must be run from the root repository folder `ci/build-vs2017.bat`.
- `ci/build-release-vs2017.bat` - Builds and installs release target only. This script is usually used for making public release versions.
Expand Down

0 comments on commit a9abfa6

Please sign in to comment.