[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.11 1.12 driver.cmake NONE 1.1 pcShared.c NONE 1.1 pcShared.h NONE 1.1 pcStatic.c NONE 1.1 perconfig.c 1.1 1.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/Testing
In directory public:/mounts/ram/cvs-serv16021/Tests/Testing

Modified Files:
	CMakeLists.txt perconfig.c 
Added Files:
	driver.cmake pcShared.c pcShared.h pcStatic.c 
Log Message:
Test add_test() generator expressions

This teaches the 'testing' test to try generator expressions in
arguments to add_test(NAME).  This test case mimics a common use-case of
passing executables to test driver scripts.  We excercise the syntax for
per-configuration target file names.


Index: perconfig.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Testing/perconfig.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** perconfig.c	16 Mar 2009 14:51:30 -0000	1.1
--- perconfig.c	11 Aug 2009 13:56:02 -0000	1.2
***************
*** 1,4 ****
--- 1,8 ----
+ #include "pcShared.h"
+ extern const char* pcStatic(void);
  int main()
  {
+   pcStatic();
+   pcShared();
    return 0;
  }

--- NEW FILE: pcShared.h ---
#ifndef pcShared_h
#define pcShared_h

#ifdef _WIN32
# ifdef pcShared_EXPORTS
#  define PC_EXPORT __declspec(dllexport)
# else
#  define PC_EXPORT __declspec(dllimport)
# endif
#else
# define PC_EXPORT
#endif

PC_EXPORT const char* pcShared(void);

#endif

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Testing/CMakeLists.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** CMakeLists.txt	16 Mar 2009 14:51:26 -0000	1.11
--- CMakeLists.txt	11 Aug 2009 13:55:48 -0000	1.12
***************
*** 55,60 ****
--- 55,87 ----
  
  # Per-config target name test.
+ ADD_LIBRARY(pcStatic STATIC pcStatic.c)
+ SET_PROPERTY(TARGET pcStatic PROPERTY RELEASE_POSTFIX -opt)
+ SET_PROPERTY(TARGET pcStatic PROPERTY DEBUG_POSTFIX -dbg)
+ ADD_LIBRARY(pcShared SHARED pcShared.c)
+ SET_PROPERTY(TARGET pcShared PROPERTY RELEASE_POSTFIX -opt)
+ SET_PROPERTY(TARGET pcShared PROPERTY DEBUG_POSTFIX -dbg)
+ SET_PROPERTY(TARGET pcShared PROPERTY VERSION 1.2)
+ SET_PROPERTY(TARGET pcShared PROPERTY SOVERSION 3)
+ IF(NOT WIN32)
+   SET(soname_file -DpcShared_soname_file=$<TARGET_SONAME_FILE:pcShared>)
+ ENDIF()
  ADD_EXECUTABLE(perconfig perconfig.c)
+ TARGET_LINK_LIBRARIES(perconfig pcStatic pcShared)
  SET_PROPERTY(TARGET perconfig PROPERTY RELEASE_POSTFIX -opt)
  SET_PROPERTY(TARGET perconfig PROPERTY DEBUG_POSTFIX -dbg)
  ADD_TEST(NAME testing.perconfig COMMAND perconfig)
+ 
+ # Test using a driver script with generator expressions.
+ ADD_TEST(NAME testing.driver
+   COMMAND ${CMAKE_COMMAND}
+     -Dconfiguration=$<CONFIGURATION>
+     -Dperconfig_file_dir=$<TARGET_FILE_DIR:perconfig>
+     -Dperconfig_file_name=$<TARGET_FILE_NAME:perconfig>
+     -Dperconfig_file=$<TARGET_FILE:perconfig>
+     -DpcStatic_file=$<TARGET_FILE:pcStatic>
+     -DpcStatic_linker_file=$<TARGET_LINKER_FILE:pcStatic>
+     -DpcShared_file=$<TARGET_FILE:pcShared>
+     -DpcShared_linker_file=$<TARGET_LINKER_FILE:pcShared>
+     ${soname_file}
+     -P ${Testing_SOURCE_DIR}/driver.cmake
+   )

--- NEW FILE: pcStatic.c ---
const char* pcStatic(void)
{
  return "INFO:symbol[pcStatic]";
}

--- NEW FILE: pcShared.c ---
#include "pcShared.h"
const char* pcShared(void)
{
  return "INFO:symbol[pcShared]";
}

--- NEW FILE: driver.cmake ---
# Print values for human reference.
foreach(v
    configuration
    perconfig_file_dir
    perconfig_file_name
    perconfig_file
    pcStatic_file
    pcStatic_linker_file
    pcShared_file
    pcShared_linker_file
    pcShared_soname_file
    )
  message("${v}=${${v}}")
endforeach()

# Verify that file names match as expected.
set(pc_file_components ${perconfig_file_dir}/${perconfig_file_name})
if(NOT "${pc_file_components}" STREQUAL "${perconfig_file}")
  message(SEND_ERROR
    "File components ${pc_file_components} do not match ${perconfig_file}")
endif()
if(NOT "${pcStatic_file}" STREQUAL "${pcStatic_linker_file}")
  message(SEND_ERROR
    "pcStatic_file does not match pcStatic_linker_file:\n"
    "  ${pcStatic_file}\n"
    "  ${pcStatic_linker_file}\n"
    )
endif()

# Verify that the implementation files are named correctly.
foreach(lib pcStatic pcShared)
  file(STRINGS "${${lib}_file}" info LIMIT_COUNT 1 REGEX "INFO:[^[]*\\[")
  if(NOT "${info}" MATCHES ".*INFO:symbol\\[${lib}\\].*")
    message(SEND_ERROR "No INFO:symbol[${lib}] found in:\n  ${${lib}_file}")
  endif()
endforeach()
execute_process(COMMAND ${perconfig_file} RESULT_VARIABLE result)
if(result)
  message(SEND_ERROR "Error running:\n  ${perconfig_file}\n(${result})")
endif()