[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.3.2.2 1.3.2.3

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Log Message:
ENH: merge in changes from CVS to branch for 2.6.3 RC 8


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExportImport/Import/CMakeLists.txt,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C 2 -d -r1.3.2.2 -r1.3.2.3
*** CMakeLists.txt	3 Sep 2008 13:43:28 -0000	1.3.2.2
--- CMakeLists.txt	13 Jan 2009 18:03:55 -0000	1.3.2.3
***************
*** 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.
--- 33,36 ----
***************
*** 59,65 ****
  # 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.
  add_library(imp_mod1b MODULE imp_mod1.c)
  target_link_libraries(imp_mod1b bld_testExe2)
--- 58,70 ----
  # Try linking to a library imported from the build tree.
  target_link_libraries(imp_testExe1b bld_testLib2 bld_testLib3 bld_testLib4)
  
  # Try building a plugin to an executable imported from the build tree.
  add_library(imp_mod1b MODULE imp_mod1.c)
  target_link_libraries(imp_mod1b bld_testExe2)
+ 
+ # Export/CMakeLists.txt pretends the RelWithDebInfo (as well as Debug)
+ # configuration should link to debug libs.
+ foreach(c DEBUG RELWITHDEBINFO)
+   set_property(TARGET imp_testExe1 PROPERTY COMPILE_DEFINITIONS_${c} EXE_DBG)
+   set_property(TARGET imp_testExe1b PROPERTY COMPILE_DEFINITIONS_${c} EXE_DBG)
+ endforeach(c)