Skip to content

Commit

Permalink
Merge pull request #141 from QtExcel/qt6beta
Browse files Browse the repository at this point in the history
- testing in Qt 6.0.1
  • Loading branch information
j2doll committed Feb 12, 2021
2 parents c8ca4f5 + 4608840 commit fb3c2cf
Show file tree
Hide file tree
Showing 5 changed files with 101 additions and 12 deletions.
46 changes: 46 additions & 0 deletions HowToSetProject-cmake.ko.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
## cmake 사용하기

> *Read this in other languages: [English](HowToSetProject-cmake.md), :kr: [한국어](HowToSetProject-cmake.ko.md)*
:one: 아래와 같은 명령어들읋 입력하세요.

:two: MingW 사용하기

- QXlsx 라이브러리

```
mkdir build
cd build
cmake -G "MinGW Makefiles" ..\QXlsx\
mingw32-make
```

- HelloWorld

```
mkdir build2
cd build2
cmake -G "MinGW Makefiles" ..\HelloWorld\
mingw32-make
```

:three: Linux/Mac/Unix 사용하기

- QXlsx 라이브러리

```
mkdir build
cd build
cmake -G "Unix Makefiles" ../QXlsx/
make
```

- HelloWorld

```
mkdir build2
cd build2
cmake -G "Unix Makefiles" ..\HelloWorld\
make
```

48 changes: 48 additions & 0 deletions HowToSetProject-cmake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
## Using cmake

> *Read this in other languages: [English](HowToSetProject-cmake.md), :kr: [한국어](HowToSetProject-cmake.ko.md)*
:one: Enter the command as shown below.

:two: Using MingW

- QXlsx library

```
mkdir build
cd build
cmake -G "MinGW Makefiles" ..\QXlsx\
mingw32-make
```

- HelloWorld

```
mkdir build2
cd build2
cmake -G "MinGW Makefiles" ..\HelloWorld\
mingw32-make
```


:three: Using Linux/Mac/Unix

- QXlsx library

```
mkdir build
cd build
cmake -G "Unix Makefiles" ../QXlsx/
make
```

- HelloWorld

```
mkdir build2
cd build2
cmake -G "Unix Makefiles" ..\HelloWorld\
make
```


3 changes: 3 additions & 0 deletions HowToSetProject.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,6 @@ int main(int argc, char *argv[])
![](markdown.data/13.jpg)
<br /><br />
8 changes: 2 additions & 6 deletions README.ko.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

## 설정하는 방법 (설치)

- [QXlsx 프로젝트 설정하는 방법](HowToSetProject.ko.md) 참조
- :권장: [QXlsx 프로젝트 설정하는 방법 (qmake)](HowToSetProject.ko.md) 참조
- [QXlsx 프로젝트 설정하는 방법 (cmake)](HowToSetProject-cmake.ko.md) 참조

## 테스트 환경

Expand Down Expand Up @@ -47,11 +48,6 @@
- colorprintf 는 MIT 라이센스 입니다. [https://github.com/VittGam/colorprintf](https://github.com/VittGam/colorprintf)
- HelloActions-Qt 는 MIT 라이센스 입니다. [https://github.com/jaredtao/HelloActions-Qt](https://github.com/jaredtao/HelloActions-Qt)

## 축하
- 우리의 코드가 북극에 갑니다.
- ![](markdown.data/arcvalut.png)
- 자세한 정보는 링크를 보세요. https://archiveprogram.github.com/

## :email: 문의
- 이슈를 남겨 주세요. [https://github.com/QtExcel/QXlsx/issues](https://github.com/QtExcel/QXlsx/issues)
- 프로젝트 참여에 관심이 있으신 분은 이슈로 연락주세요.
Expand Down
8 changes: 2 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

## How to set up (Installation)

- See [how to setup QXlsx project](HowToSetProject.md)
- :Recommended: See [how to setup QXlsx project (qmake)](HowToSetProject.md)
- See [how to setup QXlsx project (cmake)](HowToSetProject-cmake.md)

## Tested environment

Expand Down Expand Up @@ -47,11 +48,6 @@
- colorprintf is under MIT license. [https://github.com/VittGam/colorprintf](https://github.com/VittGam/colorprintf)
- HelloActions-Qt is under MIT license. [https://github.com/jaredtao/HelloActions-Qt](https://github.com/jaredtao/HelloActions-Qt)

## Congratulations
- Our code is going to the North Pole.
- ![](markdown.data/arcvalut.png)
- See link for more information. https://archiveprogram.github.com/

## :email: Contact
- Leave me a issue. [https://github.com/QtExcel/QXlsx/issues](https://github.com/QtExcel/QXlsx/issues)
- If you are interested in participating in the project, please contact us by issue.
Expand Down

0 comments on commit fb3c2cf

Please sign in to comment.