Commit 1d89967d authored by Lynn Garren's avatar Lynn Garren
Browse files

Add INCLUDES destination to install of libraries - Ben Morgan

parent b5596665
...@@ -15,7 +15,7 @@ macro(clhep_build_library package) ...@@ -15,7 +15,7 @@ macro(clhep_build_library package)
${CLHEP_${package}_list} ${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CLHEP_${package}_list} ${CMAKE_CURRENT_SOURCE_DIR}/${file}
CACHE INTERNAL "${package} sources" CACHE INTERNAL "${package} sources"
) )
endforeach(file) endforeach()
##message( STATUS "in ${package}, clheplib source list ${CLHEP_${package}_list}" ) ##message( STATUS "in ${package}, clheplib source list ${CLHEP_${package}_list}" )
# check for dependencies # check for dependencies
...@@ -35,12 +35,10 @@ macro(clhep_build_library package) ...@@ -35,12 +35,10 @@ macro(clhep_build_library package)
SET_TARGET_PROPERTIES (${package} SET_TARGET_PROPERTIES (${package}
PROPERTIES PROPERTIES
OUTPUT_NAME CLHEP-${package}-${VERSION} OUTPUT_NAME CLHEP-${package}-${VERSION}
CLEAN_DIRECT_OUTPUT 1
) )
SET_TARGET_PROPERTIES(${package}S SET_TARGET_PROPERTIES(${package}S
PROPERTIES PROPERTIES
OUTPUT_NAME CLHEP-${package}-${VERSION} OUTPUT_NAME CLHEP-${package}-${VERSION}
CLEAN_DIRECT_OUTPUT 1
) )
target_link_libraries(${package} ${package_library_list} ) target_link_libraries(${package} ${package_library_list} )
...@@ -52,6 +50,7 @@ macro(clhep_build_library package) ...@@ -52,6 +50,7 @@ macro(clhep_build_library package)
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}
INCLUDES DESTINATION include
) )
endmacro(clhep_build_library) endmacro(clhep_build_library)
...@@ -69,12 +68,10 @@ macro(clhep_build_libclhep ) ...@@ -69,12 +68,10 @@ macro(clhep_build_libclhep )
SET_TARGET_PROPERTIES(CLHEP SET_TARGET_PROPERTIES(CLHEP
PROPERTIES PROPERTIES
OUTPUT_NAME CLHEP-${VERSION} OUTPUT_NAME CLHEP-${VERSION}
CLEAN_DIRECT_OUTPUT 1
) )
SET_TARGET_PROPERTIES(CLHEPS SET_TARGET_PROPERTIES(CLHEPS
PROPERTIES PROPERTIES
OUTPUT_NAME CLHEP-${VERSION} OUTPUT_NAME CLHEP-${VERSION}
CLEAN_DIRECT_OUTPUT 1
) )
# export creates library dependency files for CLHEPConfig.cmake # export creates library dependency files for CLHEPConfig.cmake
...@@ -83,6 +80,7 @@ macro(clhep_build_libclhep ) ...@@ -83,6 +80,7 @@ macro(clhep_build_libclhep )
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib${LIB_SUFFIX} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}
INCLUDES DESTINATION include
) )
if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" ) if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment