[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.3.2.1 1.3.2.2 imp_testExe1.c 1.3 1.3.2.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/ExportImport/Import
In directory public:/mounts/ram/cvs-serv18450/Tests/ExportImport/Import

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt imp_testExe1.c 
Log Message:
ENH: 2.6.2 rc 2 merge from main tree


Index: imp_testExe1.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExportImport/Import/imp_testExe1.c,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C 2 -d -r1.3 -r1.3.2.1
*** imp_testExe1.c	28 Jan 2008 19:46:16 -0000	1.3
--- imp_testExe1.c	3 Sep 2008 13:43:28 -0000	1.3.2.1
***************
*** 4,11 ****
  extern int testLib3();
  extern int testLib4();
  
  int main()
  {
    return (testLib2() + generated_by_testExe1() + testLib3() + testLib4()
!           + generated_by_testExe3());
  }
--- 4,21 ----
  extern int testLib3();
  extern int testLib4();
+ extern int testLib4lib();
+ 
+ /* Switch a symbol between debug and optimized builds to make sure the
+    proper library is found from the testLib4 link interface.  */
+ #ifdef EXE_DBG
+ # define testLib4libcfg testLib4libdbg
+ #else
+ # define testLib4libcfg testLib4libopt
+ #endif
+ extern testLib4libcfg(void);
  
  int main()
  {
    return (testLib2() + generated_by_testExe1() + testLib3() + testLib4()
!           + generated_by_testExe3() + testLib4lib() + testLib4libcfg());
  }

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExportImport/Import/CMakeLists.txt,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C 2 -d -r1.3.2.1 -r1.3.2.2
*** CMakeLists.txt	25 Mar 2008 23:59:00 -0000	1.3.2.1
--- CMakeLists.txt	3 Sep 2008 13:43:28 -0000	1.3.2.2
***************
*** 33,36 ****
--- 33,37 ----
  # Try linking to a library imported from the install tree.
  target_link_libraries(imp_testExe1 exp_testLib2 exp_testLib3 exp_testLib4)
+ set_property(TARGET imp_testExe1 PROPERTY COMPILE_DEFINITIONS_DEBUG EXE_DBG)
  
  # Try building a plugin to an executable imported from the install tree.
***************
*** 58,61 ****
--- 59,63 ----
  # Try linking to a library imported from the build tree.
  target_link_libraries(imp_testExe1b bld_testLib2 bld_testLib3 bld_testLib4)
+ set_property(TARGET imp_testExe1b PROPERTY COMPILE_DEFINITIONS_DEBUG EXE_DBG)
  
  # Try building a plugin to an executable imported from the build tree.