Commit eccdf506 authored by Lynn Garren's avatar Lynn Garren
Browse files

Merge branch 'rename_modulemap' into 'develop'

Rename modulemap name to avoid name clashes.

See merge request !10
parents bf00740b e64770b3
......@@ -46,9 +46,9 @@ macro (clhep_copy_headers )
INSTALL (FILES ${CLHEP_BINARY_DIR}/CLHEP/ClhepVersion.h
DESTINATION include/CLHEP )
# handle the module.modulemap file
CONFIGURE_FILE( ${CLHEP_SOURCE_DIR}/module.modulemap ${CLHEP_BINARY_DIR}/module.modulemap COPYONLY )
INSTALL (FILES ${CLHEP_BINARY_DIR}/module.modulemap
# handle the clhep.modulemap file
CONFIGURE_FILE( ${CLHEP_SOURCE_DIR}/clhep.modulemap ${CLHEP_BINARY_DIR}/clhep.modulemap COPYONLY )
INSTALL (FILES ${CLHEP_BINARY_DIR}/clhep.modulemap
DESTINATION include )
endmacro (clhep_copy_headers)
......@@ -275,7 +275,10 @@ macro( _clhep_check_cxxstd )
##message(STATUS "_clhep_check_cxxstd debug: CLHEP_BUILD_CXXSTD HAVE_STDCXX: ${CLHEP_BUILD_CXXSTD} ${HAVE_STDCXX}")
if( DEFINED HAVE_STDCXX )
if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CLHEP_BUILD_CXXSTD}" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CLHEP_BUILD_CXXSTD}" )
if (${CMAKE_CXX_FLAGS} MATCHES "-fmodules")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmodule-map-file=${CLHEP_BINARY_DIR}/clhep.modulemap")
endif()
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CLHEP_BUILD_CXXSTD}" )
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" )
......
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