Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Rename CTestCustom.ctest -> CTestConfig.cmake (so that cmake sees it when generating...
authormquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 22 Dec 2009 23:35:41 +0000 (23:35 +0000)
committermquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Tue, 22 Dec 2009 23:35:41 +0000 (23:35 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6955 48e7efb5-ca39-0410-a469-dd3cf9ba447f

buildtools/Cmake/CMakeLists.txt
buildtools/Cmake/CTestConfig.cmake [moved from buildtools/Cmake/CTestCustom.ctest with 87% similarity]

index b842c4b..d197a88 100644 (file)
@@ -21,16 +21,14 @@ ENDIF(SIZEOF_INT EQUAL 4)
 
 
 ### Enable tests
+INCLUDE(CTestConfig.cmake)
 ENABLE_TESTING()
 INCLUDE(CTest)
 INCLUDE(Dart)
-
-INCLUDE(CTestCustom.ctest)
 INCLUDE(CTestList.txt)
 
 # Install the CTest configuration in the build dir
-configure_file(CTestCustom.ctest ${CMAKE_BINARY_DIR}/CTestCustom.ctest
-COPYONLY)
+configure_file(CTestConfig.cmake ${CMAKE_BINARY_DIR}/CTestCustom.ctest COPYONLY)
 
 #SET (CMAKE_COMPILER_IS_GNUCXX 1)
 #SET (CMAKE_COMPILER_IS_GNUCC 1)
similarity index 87%
rename from buildtools/Cmake/CTestCustom.ctest
rename to buildtools/Cmake/CTestConfig.cmake
index 8d5eaf1..aeea557 100644 (file)
@@ -18,16 +18,16 @@ exec_program("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}")
 endmacro(getuname)
 MARK_AS_ADVANCED(UNAME)
 
-if(${CMAKE_SYSTEM_NAME} STREQUAL "darwin")
+if(CMAKE_SYSTEM_NAME STREQUAL "darwin")
   SET(DISTRIB2 "OSX")
-else(${CMAKE_SYSTEM_NAME} STREQUAL "darwin")
+else(CMAKE_SYSTEM_NAME STREQUAL "darwin")
 
   #Try to get the distrib
   find_program(CAT NAMES cat)
   exec_program("${CAT}" ARGS " /etc/issue" OUTPUT_VARIABLE DISTRIB)
   MARK_AS_ADVANCED(CAT)
   STRING(REPLACE "\\n \\l" "" DISTRIB2 ${DISTRIB})
-endif(${CMAKE_SYSTEM_NAME} STREQUAL "darwin")
+endif(CMAKE_SYSTEM_NAME STREQUAL "darwin")
          
 getuname(osname -s)
 getuname(node -n)