Changeset 2183

Show
Ignore:
Timestamp:
05/26/2008 10:08:31 AM (3 months ago)
Author:
moo
Message:

remove \n from EXEC_PROGRAM correctly

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/cmake/UsePkgConfig.cmake

    r1658 r2183  
    3434    IF(NOT _return_VALUE) 
    3535 
    36       EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_msvc_mode} ${_package} --variable=includedir OUTPUT_VARIABLE ${_include_DIR} ) 
     36      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_msvc_mode} ${_package} --variable=includedir OUTPUT_VARIABLE __include_DIR) 
     37      STRING(REPLACE "\n" "" ${_include_DIR} ${__include_DIR}) 
    3738 
    38       EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_msvc_mode} ${_package} --variable=libdir OUTPUT_VARIABLE ${_link_DIR} ) 
     39      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_msvc_mode} ${_package} --variable=libdir OUTPUT_VARIABLE __link_DIR) 
     40      STRING(REPLACE "\n" "" ${_link_DIR} ${__link_DIR}) 
    3941 
    40       EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_msvc_mode} ${_package} --libs OUTPUT_VARIABLE ${_link_FLAGS} ) 
     42      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_msvc_mode} ${_package} --libs OUTPUT_VARIABLE __link_FLAGS) 
     43      STRING(REPLACE "\n" "" ${_link_FLAGS} ${__link_FLAGS}) 
    4144 
    42       EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_msvc_mode} ${_package} --cflags OUTPUT_VARIABLE ${_cflags} ) 
     45      EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_msvc_mode} ${_package} --cflags OUTPUT_VARIABLE __cflags) 
     46      STRING(REPLACE "\n" "" ${_cflags} ${__cflags}) 
    4347 
    4448    ENDIF(NOT _return_VALUE) 

  • trunk/src/CMakeLists.txt

    r1890 r2183  
    7575    MESSAGE(STATUS "found ${_package}: ${XCONFIG_EXECUTABLE}") 
    7676 
    77     EXEC_PROGRAM(${XCONFIG_EXECUTABLE} ARGS --libs OUTPUT_VARIABLE ${_link_FLAGS} ) 
    78     EXEC_PROGRAM(${XCONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE ${_cflags} ) 
     77    EXEC_PROGRAM(${XCONFIG_EXECUTABLE} ARGS --libs OUTPUT_VARIABLE __link_FLAGS) 
     78    STRING(REPLACE "\n" "" ${_link_FLAGS} ${__link_FLAGS}) 
     79    EXEC_PROGRAM(${XCONFIG_EXECUTABLE} ARGS --cflags OUTPUT_VARIABLE __cflags) 
     80    STRING(REPLACE "\n" "" ${_cflags} ${__cflags}) 
    7981 
    8082  ELSE(${_package}CONFIG_EXECUTABLE) 
    … …  
    144146    MESSAGE(STATUS "found xml2 at: LDFLAGS: ${XML2_LDFLAGS} CFLAGS: ${XML2_CFLAGS}") 
    145147 
    146     IF(NOT XML2_CFLAGS STREQUAL "\n") 
    147       ## if it is empty we'll get newline returned 
    148       SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${XML2_CFLAGS}") 
    149     ENDIF(NOT XML2_CFLAGS STREQUAL "\n") 
     148    ## if it is empty we'll get newline returned 
     149    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${XML2_CFLAGS}") 
    150150 
    151151    CHECK_INCLUDE_FILES(libxml/tree.h HAVE_LIBXML_H)