cvs: gd /libgd/tests CMakeLists.txt
[email protected] ("Pierre-Alain Joye") Thu, 24 Apr 2008 12:30:34 -0000
| Newsgroups | php.gd.cvs |
|---|---|
| Message-ID | <cvspajoye1209040234@cvsserver> |
pajoye Thu Apr 24 12:30:34 2008 UTC
Modified files:
/gd/libgd/tests CMakeLists.txt
Log:
- add gcc flags only if gcc is used
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/CMakeLists.txt?r1=1.5&r2=1.6&diff_format=u
Index: gd/libgd/tests/CMakeLists.txt
diff -u gd/libgd/tests/CMakeLists.txt:1.5 gd/libgd/tests/CMakeLists.txt:1.6
--- gd/libgd/tests/CMakeLists.txt:1.5 Sun Apr 20 12:30:16 2008
+++ gd/libgd/tests/CMakeLists.txt Thu Apr 24 12:30:33 2008
@@ -3,19 +3,14 @@
SET(DART_TESTING_TIMEOUT 5)
INCLUDE(Dart)
- #ENABLE_TESTING()
- #set(GD_SOURCE_DIR "/home/pierre/cvs/gd/libgd")
- #set(GD_INCLUDE_DIR "/home/pierre/cvs/gd/libgd")
- #set(GD_LIBS_DIR "/home/pierre/cvs/gd/libgd/.libs")
set(GDTEST_SOURCE_DIR ${GD_SOURCE_DIR}/tests/gdtest)
- # If build in the src tree or set the libs in the lines before
- #SET(GD_LIB gd)
-
- SET(CMAKE_BUILD_TYPE TESTINGGCOV)
- SET(CMAKE_CXX_FLAGS_TESTINGGCOV "-g3 -O0")
- SET(CMAKE_C_FLAGS_TESTINGGCOV "-g3 -O0")
+ IF (ENABLE_GCOV AND CMAKE_COMPILER_IS_GNUCC)
+ SET(CMAKE_BUILD_TYPE TESTINGGCOV)
+ SET(CMAKE_CXX_FLAGS_TESTINGGCOV "-g3 -O0")
+ SET(CMAKE_C_FLAGS_TESTINGGCOV "-g3 -O0")
+ endif (CMAKE_COMPILER_IS_GNUCC)
message(STATUS "gd include dir: ${GD_INCLUDE_DIR}" )
message(STATUS "gd libs dir: ${GD_LIBS_DIR}" )
@@ -23,9 +18,6 @@
include_directories (BEFORE ${GD_INCLUDE_DIR} "${GDTEST_SOURCE_DIR}")
link_directories ("${GD_LIBS_DIR}" "${GDTEST_BINARY_DIR}/gdtest")
- #FIND_LIBRARY(GD_LIB "gd" PATHS ${GD_LIBS_DIR})
- #message(STATUS "GD_LIB: ${GD_LIB}")
-
include_directories (BEFORE ${GD_INCLUDE_DIR} "${GDTEST_SOURCE_DIR}" "${CMAKE_BINARY_DIR}")
SET(TESTS_DIRS