[cmake-commits] king committed CMakeLists.txt 1.30 1.31 TestLink.c NONE 1.1

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Sep 15 14:31:26 EDT 2006


Update of /cvsroot/CMake/CMake/Tests/Complex/Library
In directory public:/mounts/ram/cvs-serv10478/Library

Modified Files:
	CMakeLists.txt 
Added Files:
	TestLink.c 
Log Message:
ENH: Added test for linking to a static library that is next to a shared library.  See bug#1644 for related changes.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Complex/Library/CMakeLists.txt,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- CMakeLists.txt	2 Jun 2005 18:56:50 -0000	1.30
+++ CMakeLists.txt	15 Sep 2006 18:31:24 -0000	1.31
@@ -53,6 +53,13 @@
   MESSAGE(SEND_ERROR "SET_TARGET_PROPERTIES or GET_TARGET_PROPERTY failed, FOO_BAR_VAR should be BAR, but is ${FOO_BAR_VAR}")
 ENDIF(${FOO_BAR_VAR} MATCHES "BAR")
 
+# Create static and shared lib of same name.
+IF(CMAKE_EXE_LINK_STATIC_CXX_FLAGS)
+  ADD_LIBRARY(CMakeTestLinkStatic STATIC TestLink.c)
+  ADD_LIBRARY(CMakeTestLinkShared SHARED TestLink.c)
+  SET_TARGET_PROPERTIES(CMakeTestLinkStatic CMakeTestLinkShared
+    PROPERTIES OUTPUT_NAME CMakeTestLink CLEAN_DIRECT_OUTPUT 1)
+ENDIF(CMAKE_EXE_LINK_STATIC_CXX_FLAGS)
 
 #
 # Attach pre-build/pre-link/post-build custom-commands to the lib.

--- NEW FILE: TestLink.c ---
int TestLinkGetType()
{
#ifdef CMakeTestLinkShared_EXPORTS
  return 0;
#else
  return 1;
#endif
}



More information about the Cmake-commits mailing list