certi-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[certi-cvs] applications/PyHLA PyHLA-autoconfigure.cmake


From: certi-cvs
Subject: [certi-cvs] applications/PyHLA PyHLA-autoconfigure.cmake
Date: Mon, 13 Jul 2009 11:29:50 +0000

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Eric NOULARD <erk>      09/07/13 11:29:50

Modified files:
        PyHLA          : PyHLA-autoconfigure.cmake 

Log message:
        Enhance automatic install script
        in order to make it more portable.
        
        This needs more work on Windows because
        default CMake generator may not be there...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/PyHLA/PyHLA-autoconfigure.cmake?cvsroot=certi&r1=1.1&r2=1.2

Patches:
Index: PyHLA-autoconfigure.cmake
===================================================================
RCS file: /sources/certi/applications/PyHLA/PyHLA-autoconfigure.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PyHLA-autoconfigure.cmake   12 Jul 2009 19:57:28 -0000      1.1
+++ PyHLA-autoconfigure.cmake   13 Jul 2009 11:29:50 -0000      1.2
@@ -55,12 +55,29 @@
                 RESULT_VARIABLE CONFIG_RES
                 OUTPUT_VARIABLE CONFIG_OUT
                 ERROR_VARIABLE CONFIG_ERR
+                TIMEOUT 200
                 )
                               
-message(STATUS "Building with ${CMAKE_BUILD_TOOL}...")
 # CMAKE_BUILD_TOOL is not defined in scripting (-P) mode
+# so we have to build a sample project for knowing it
+file(MAKE_DIRECTORY "TestProj")                              
+file(WRITE TestProj/CMakeLists.txt 
+    "
+PROJECT(GETBT C CXX)
+MESSAGE(STATUS \"BT=\${CMAKE_BUILD_TOOL}==\")
+    "
+     )     
+execute_process(COMMAND  ${CMAKE_COMMAND} .
+                WORKING_DIRECTORY  ./TestProj      
+                OUTPUT_VARIABLE BT
+                TIMEOUT 100
+                ERROR_QUIET)
+file(REMOVE_RECURSE  "TestProj")                           
+string(REGEX MATCH "^-- .*=(.*)==.*" TEMP ${BT})
+set(BUILD_TOOL ${CMAKE_MATCH_1})           
 
-execute_process(COMMAND make                 
+message(STATUS "Building with ${BUILD_TOOL}...")
+execute_process(COMMAND ${BUILD_TOOL}        
                 WORKING_DIRECTORY ${PYHLA_FILE_PREFIX}
                 RESULT_VARIABLE CONFIG_RES
                 OUTPUT_VARIABLE CONFIG_OUT




reply via email to

[Prev in Thread] Current Thread [Next in Thread]