Attachment #541824 for bug #597768

Lines 1-7 Link Here

(-)a/src/CMakeLists.txt (-5 / +7 lines)
1	INCLUDE_DIRECTORIES(
2	${HDF5_INCLUDE_DIRS}
3	${MPI_INCLUDE_DIRS})
4
5	# On Win platform, we need to make sure symbols are properly exported in	1	# On Win platform, we need to make sure symbols are properly exported in
6	# the intermediary OBJECT targes built in the sub-directories:	2	# the intermediary OBJECT targes built in the sub-directories:
7	# The definition "-D<target>_EXPORTS" is normally added automatically by CMake	3	# The definition "-D<target>_EXPORTS" is normally added automatically by CMake
Lines 19-24 Link Here
19	INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include	15	INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include
20	${PROJECT_SOURCE_DIR}/include)	16	${PROJECT_SOURCE_DIR}/include)
		17	# these includes must go after project ones to avoid masking by
		18	# previous versions already installed
		19	INCLUDE_DIRECTORIES(
		20	${HDF5_INCLUDE_DIRS}
		21	${MPI_INCLUDE_DIRS})
		22
21	# Get pure C intermediary targets:	23	# Get pure C intermediary targets:
22	ADD_SUBDIRECTORY(hdfi)	24	ADD_SUBDIRECTORY(hdfi)
23	ADD_SUBDIRECTORY(ci)	25	ADD_SUBDIRECTORY(ci)
Lines 107-113 Link Here
107	IF(MEDFILE_BUILD_SHARED_LIBS)	109	IF(MEDFILE_BUILD_SHARED_LIBS)
108	## Intermediate library - this is unavoidable	110	## Intermediate library - this is unavoidable
109	## if we want the Fortran wrapper to build correctly under win.	111	## if we want the Fortran wrapper to build correctly under win.
110	ADD_LIBRARY(medfwrap STATIC ${medfort_wrap_SOURCES})	112	ADD_LIBRARY(medfwrap SHARED ${medfort_wrap_SOURCES})
111	TARGET_LINK_LIBRARIES(medfwrap medC)	113	TARGET_LINK_LIBRARIES(medfwrap medC)
112	INSTALL(TARGETS medfwrap EXPORT medfileTargetsF DESTINATION lib64)	114	INSTALL(TARGETS medfwrap EXPORT medfileTargetsF DESTINATION lib64)
113		115

Lines 33-38 Link Here

(-)a/tools/mdump/CMakeLists.txt (-2 / +2 lines)
33	CONFIGURE_FILE(xmdump3.in ${PROJECT_BINARY_DIR}/xmdump3 @ONLY)	33	CONFIGURE_FILE(xmdump3.in ${PROJECT_BINARY_DIR}/xmdump3 @ONLY)
34		34
35	INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/xmdump2 ${PROJECT_BINARY_DIR}/xmdump3 DESTINATION bin)	35	INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/xmdump2 ${PROJECT_BINARY_DIR}/xmdump3 DESTINATION bin)
36	INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)")	36	INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink mdump3 mdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")")
37	INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY ${DESTDIR}${CMAKE_INSTALL_PREFIX}/bin)")	37	INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink xmdump3 xmdump WORKING_DIRECTORY \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin\")")
38		38




INCLUDE_DIRECTORIES(
  ${HDF5_INCLUDE_DIRS}
  ${MPI_INCLUDE_DIRS}
)
 
SET(med236_SOURCES MEDaffiche.c)

# Definitions

    "${PROJECT_BINARY_DIR}/include/2.3.6"
    "${PROJECT_SOURCE_DIR}/include/2.3.6")

# these includes must go after project ones to avoid masking by
# previous versions already installed
INCLUDE_DIRECTORIES(
  ${HDF5_INCLUDE_DIRS}
  ${MPI_INCLUDE_DIRS}
)
 
# Build intermediate targets _cfi236, _hdfi236, _misc236 and _ci236 
# (and their static counterpart):
ADD_SUBDIRECTORY(cfi)

Return to bug 597768

Lines 1-8 Link Here

(-)a/src/2.3.6/CMakeLists.txt (-5 / +7 lines)
1	INCLUDE_DIRECTORIES(
2	${HDF5_INCLUDE_DIRS}
3	${MPI_INCLUDE_DIRS}
4	)
5
6	SET(med236_SOURCES MEDaffiche.c)	1	SET(med236_SOURCES MEDaffiche.c)
7		2
8	# Definitions	3	# Definitions
Lines 13-18 Link Here
13	"${PROJECT_BINARY_DIR}/include/2.3.6"	8	"${PROJECT_BINARY_DIR}/include/2.3.6"
14	"${PROJECT_SOURCE_DIR}/include/2.3.6")	9	"${PROJECT_SOURCE_DIR}/include/2.3.6")
15		10
		11	# these includes must go after project ones to avoid masking by
		12	# previous versions already installed
		13	INCLUDE_DIRECTORIES(
		14	${HDF5_INCLUDE_DIRS}
		15	${MPI_INCLUDE_DIRS}
		16	)
		17
16	# Build intermediate targets _cfi236, _hdfi236, _misc236 and _ci236	18	# Build intermediate targets _cfi236, _hdfi236, _misc236 and _ci236
17	# (and their static counterpart):	19	# (and their static counterpart):
18	ADD_SUBDIRECTORY(cfi)	20	ADD_SUBDIRECTORY(cfi)