File clhep-respect-build_static_libs.patch of Package clhep

Overview Repositories Revisions Requests Users Attributes Meta

File clhep-respect-build_static_libs.patch of Package clhep (Revision 7c888c53a147b45ef721afdef4617908)

Currently displaying revision 7c888c53a147b45ef721afdef4617908 , Show latest

Index: CLHEP/cmake/Modules/ClhepBuildLibrary.cmake
===================================================================
--- CLHEP.orig/cmake/Modules/ClhepBuildLibrary.cmake
+++ CLHEP/cmake/Modules/ClhepBuildLibrary.cmake
@@ -45,13 +45,24 @@ macro(clhep_build_library package)
   target_link_libraries(${package}S ${package_library_list_static} )
 
   # Install the libraries
-  INSTALL (TARGETS ${package} ${package}S
+  INSTALL (TARGETS ${package}
       EXPORT CLHEPLibraryDepends
       RUNTIME DESTINATION bin
       LIBRARY DESTINATION lib${LIB_SUFFIX}
       ARCHIVE DESTINATION lib${LIB_SUFFIX}
       INCLUDES DESTINATION include
       ) 
+
+  if (BUILD_STATIC_LIBS)
+    # Install the libraries
+    INSTALL (TARGETS ${package}S
+        EXPORT CLHEPLibraryDepends
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib${LIB_SUFFIX}
+        ARCHIVE DESTINATION lib${LIB_SUFFIX}
+        INCLUDES DESTINATION include
+        )
+  endif()
 endmacro(clhep_build_library)
 
 macro(clhep_build_libclhep )
@@ -88,7 +99,7 @@ macro(clhep_build_libclhep )
   SET_TARGET_PROPERTIES(CLHEPS PROPERTIES DEFINE_SYMBOL "")
 
   # export creates library dependency files for CLHEPConfig.cmake
-  INSTALL(TARGETS CLHEP CLHEPS
+  INSTALL(TARGETS CLHEP
       EXPORT CLHEPLibraryDepends
       RUNTIME DESTINATION bin
       LIBRARY DESTINATION lib${LIB_SUFFIX}
@@ -96,6 +107,16 @@ macro(clhep_build_libclhep )
       INCLUDES DESTINATION include
       ) 
 
+  if (BUILD_STATIC_LIBS)
+    INSTALL(TARGETS CLHEPS
+        EXPORT CLHEPLibraryDepends
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib${LIB_SUFFIX}
+        ARCHIVE DESTINATION lib${LIB_SUFFIX}
+        INCLUDES DESTINATION include
+        )
+  endif()
+
   if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
       # copy
       file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink 
@@ -104,13 +125,15 @@ macro(clhep_build_libclhep )
         	 "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E copy ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} WORKING_DIRECTORY \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin\" )" )
   else()
       # create the symbolic links
-      file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink 
-        	 "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} WORKING_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}\" )" )
+    if (BUILD_STATIC_LIBS)
+        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink 
+          	 "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} WORKING_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}\" )" )
+        INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink )
+    endif()
       file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_shared_symlink 
         	 "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} WORKING_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}\" )" )
   endif()
 
-  INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink )
   INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/clhep_shared_symlink )
 
 endmacro(clhep_build_libclhep )
Index: CLHEP/cmake/Modules/ClhepToolchain.cmake
===================================================================
--- CLHEP.orig/cmake/Modules/ClhepToolchain.cmake
+++ CLHEP/cmake/Modules/ClhepToolchain.cmake
@@ -53,15 +53,22 @@ configure_file(${PROJECT_SOURCE_DIR}/cma
 # This file is include()d by CLHEPConfig.cmake
 # First build up list of all modular targets, static and shared
 set(CLHEP_libraries_all ${CLHEP_libraries})
-foreach(_lib ${CLHEP_libraries})
-  list(APPEND CLHEP_libraries_all "${_lib}S")
-endforeach()
 
-export(TARGETS CLHEP CLHEPS ${CLHEP_libraries_all}
+export(TARGETS CLHEP ${CLHEP_libraries_all}
   NAMESPACE "CLHEP::"
   FILE ${PROJECT_BINARY_DIR}/CLHEPLibraryDepends.cmake
   )
 
+if (BUILD_STATIC_LIBS)
+  foreach(_lib ${CLHEP_libraries})
+    list(APPEND CLHEP_libraries_all "${_lib}S")
+  endforeach()
+  
+  export(TARGETS CLHEPS ${CLHEP_libraries_all}
+    NAMESPACE "CLHEP::"
+    FILE ${PROJECT_BINARY_DIR}/CLHEPLibraryDepends.cmake
+    )
+endif()
 
 #-----------------------------------------------------------------------
 # Pkg-config setup
Index: CLHEP/cmake/Modules/ClhepBuildTest.cmake
===================================================================
--- CLHEP.orig/cmake/Modules/ClhepBuildTest.cmake
+++ CLHEP/cmake/Modules/ClhepBuildTest.cmake
@@ -23,17 +23,23 @@ macro( clhep_test testname )
   set(srcdir ${CMAKE_CURRENT_SOURCE_DIR})
   set(builddir ${CMAKE_CURRENT_BINARY_DIR})
 
+  if (BUILD_STATIC_LIBS)
+    set(suffix "S")
+  else()
+    set(suffix "")
+  endif()
+
   if( CTST_NOLIB )
     set(package_library_list)
   else()
-    set( package_library_list ${PACKAGE}S)
+    set( package_library_list ${PACKAGE}${SUFFIX})
     #set( package_library_list ${PROJECT_BINARY_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${PACKAGE}-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} )
   endif()
 
   if( ${PACKAGE}_DEPS )
      foreach ( dep ${${PACKAGE}_DEPS} )
         ##message( STATUS "clhep_test ${testname} will use ${dep}")
-	list(APPEND package_library_list ${PACKAGE}S)
+	list(APPEND package_library_list ${PACKAGE}${SUFFIX})
 	#list(APPEND package_library_list  ${PROJECT_BINARY_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${dep}-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} )
      endforeach()
   endif()

Places

File clhep-respect-build_static_libs.patch of Package clhep (Revision 7c888c53a147b45ef721afdef4617908)

Places