[cmake-commits] alex committed CMakeLists.txt 1.6 1.7
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon May 21 10:15:45 EDT 2007
Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv19999/Tests
Modified Files:
CMakeLists.txt
Log Message:
BUG: always search for ar, ranlib, etc. except under MSVC -> this should fix the mingw fortran test
-also generate the fortran test with the kdevelop generator
Alex
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CMakeLists.txt 20 May 2007 14:11:48 -0000 1.6
+++ CMakeLists.txt 21 May 2007 14:15:42 -0000 1.7
@@ -670,7 +670,8 @@
# fortran does not work for IDE builds because
# CMAKE_STANDARD_LIBRARIES needs to be per language
- IF(CMAKE_TEST_GENERATOR MATCHES "Makefiles")
+ IF(CMAKE_TEST_GENERATOR MATCHES "Makefiles"
+ OR CMAKE_TEST_GENERATOR MATCHES "KDevelop")
# see if we can find a fortran compiler on the machine
# if so, add the fortran test and see if it works.
SET(CMAKE_Fortran_COMPILER_LIST ifort ifc efc f95 pgf95
@@ -690,7 +691,8 @@
--build-two-config
--test-command testf)
ENDIF(CMAKE_Fortran_COMPILER_FULLPATH)
- ENDIF(CMAKE_TEST_GENERATOR MATCHES "Makefiles")
+ ENDIF(CMAKE_TEST_GENERATOR MATCHES "Makefiles"
+ OR CMAKE_TEST_GENERATOR MATCHES "KDevelop")
IF(NOT CMAKE_TEST_GENERATOR MATCHES "Xcode")
INCLUDE(FindJava)
IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW)
More information about the Cmake-commits
mailing list