King_DuckZ/cmake-d
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Some dos2unix fixes. Fixed path error in run_tests_linux.sh. Set CMAKE_MODULE_PATH to look locally first in tests/CmakeLists.txt.

Browse source
This commit is contained in:
Steve King 2010-08-11 21:17:46 -07:00
parent 67f0225e42
commit f8a15aecfe
4 changed files with 253 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/CMakeLists.txt
View file

@ -1,5 +1,8 @@
# Tell cmake our project only concerns the D language. # Tell cmake our project only concerns the D language.
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
# Look for cmake modules locally first
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../cmaked)
PROJECT (CMAKED2_TESTS D) PROJECT (CMAKED2_TESTS D)
ADD_DEFINITIONS( -w -wi ) ADD_DEFINITIONS( -w -wi )
enable_testing() enable_testing()

4
tests/run_tests_linux.sh
View file

@ -8,7 +8,7 @@ cd cmaked_test_build
mkdir -p release mkdir -p release
cd release cd release
# Do a release build # Do a release build
cmake ../../tests cmake ../../cmaked2/tests
make make
make test make test
cd .. cd ..
@ -16,7 +16,7 @@ cd ..
# Do a debug build # Do a debug build
mkdir -p debug mkdir -p debug
cd debug cd debug
cmake -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=debug ../../tests cmake -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=debug ../../cmaked2/tests
make make
make test make test
cd ../.. cd ../..