nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #191

Browse Source 
685dd4a don't build tests unless we're building all-* or *-test builds (Riccardo Spagni)
This commit is contained in:
Riccardo Spagni 2014-12-01 20:01:31 +02:00
commit 7935e49529
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -251,4 +251,7 @@ endif()
include(version.cmake) include(version.cmake)
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(tests)
if(BUILD_TESTS)
add_subdirectory(tests)
endif()

16
Makefile
View File

@ -8,9 +8,12 @@ build-debug: cmake-debug
cd build/debug && $(MAKE) cd build/debug && $(MAKE)
test-debug: build-debug test-debug: build-debug
cd build/debug && $(MAKE) test mkdir -p build/debug
cd build/debug && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=Debug ../.. && $(MAKE) test
all-debug: build-debug all-debug:
mkdir -p build/debug
cd build/debug && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=Debug ../.. && $(MAKE)
cmake-release: cmake-release:
mkdir -p build/release mkdir -p build/release
@ -20,13 +23,16 @@ build-release: cmake-release
cd build/release && $(MAKE) cd build/release && $(MAKE)
test-release: build-release test-release: build-release
cd build/release && $(MAKE) test mkdir -p build/release
cd build/release && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) test
all-release: build-release all-release:
mkdir -p build/release
cd build/release && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE)
release-static: release-static:
mkdir -p build/release mkdir -p build/release
cd build/release && cmake -D STATIC=ON -D ARCH="x86-64" -D CMAKE_BUILD_TYPE=Release ../.. && $(MAKE) cd build/release && cmake -D STATIC=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE)
clean: clean:
@echo "WARNING: Back-up your wallet if it exists within ./build!" ; \ @echo "WARNING: Back-up your wallet if it exists within ./build!" ; \