diff options
| author | gkostka <kostka.grzegorz@gmail.com> | 2013-10-13 17:35:30 +0000 |
|---|---|---|
| committer | gkostka <kostka.grzegorz@gmail.com> | 2013-10-13 17:35:30 +0000 |
| commit | 7b3739e7e42e753f9e5b3820b876ff1430243a10 (patch) | |
| tree | 6e49fd2d5f964085b3a3be28f389137997df16ba /src | |
| parent | b9ef9d3916e0f57fb92a6e9fa4945ac4b0fefd4b (diff) | |
Update build system.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile | 40 |
2 files changed, 23 insertions, 21 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 21d6aae..5531090 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -35,10 +35,12 @@ endif() #DISTRIBUTION
set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "1")
-set(CPACK_PACKAGE_VERSION_PATCH "0")
+set(CPACK_PACKAGE_VERSION_PATCH "1")
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(CPACK_SOURCE_PACKAGE_FILE_NAME
"${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+set(CPACK_SOURCE_IGNORE_FILES
+"/build")
include(CPack)
add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
diff --git a/src/Makefile b/src/Makefile index db7ba07..a08f7d7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,35 +2,35 @@ all: generic bf518 cortex-m3 cortex-m4 generic
bf518:
- rm -R -f ../bf518
- cd .. && mkdir bf518
- cd ../bf518 && cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=../src/toolchain/bf518.cmake ../src
- cd ../bf518 && make
+ rm -R -f build_bf518
+ mkdir build_bf518
+ cd build_bf518 && cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=../toolchain/bf518.cmake ..
+ cd build_bf518 && make
cortex-m3:
- rm -R -f ../cortex-m3
- cd .. && mkdir cortex-m3
- cd ../cortex-m3 && cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=../src/toolchain/cortex-m3.cmake ../src
- cd ../cortex-m3 && make
+ rm -R -f build_cortex-m3
+ mkdir build_cortex-m3
+ cd build_cortex-m3 && cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=../toolchain/cortex-m3.cmake ..
+ cd build_cortex-m3 && make
cortex-m4:
- rm -R -f ../cortex-m4
- cd .. && mkdir cortex-m4
- cd ../cortex-m4 && cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=../src/toolchain/cortex-m4.cmake ../src
- cd ../cortex-m4 && make
+ rm -R -f build_cortex-m4
+ mkdir build_cortex-m4
+ cd build_cortex-m4 && cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=../toolchain/cortex-m4.cmake ..
+ cd build_cortex-m4 && make
generic:
- rm -R -f ../generic
- cd .. && mkdir generic
- cd ../generic && cmake -G"Unix Makefiles" ../src
- cd ../generic && make
+ rm -R -f build_generic
+ mkdir build_generic
+ cd build_generic && cmake -G"Unix Makefiles" ../
+ cd build_generic && make
clean:
- rm -R -f ../bf518
- rm -R -f ../cortex-m3
- rm -R -f ../cortex-m4
- rm -R -f ../generic
+ rm -R -f build_bf518
+ rm -R -f build_cortex-m3
+ rm -R -f build_cortex-m4
+ rm -R -f build_generic
\ No newline at end of file |