comparison CMakeLists.txt @ 2658:c09787b85240

Fixing warning in EZminc
author Vladimir S. FONOV <vladimir.fonov@gmail.com>
date Thu, 29 Mar 2012 17:16:26 -0400
parents 584b0bdfa619
children ccc4c941889c
comparison
equal deleted inserted replaced
2657:5857c4de2150 2658:c09787b85240
13 13
14 SET(PACKAGE_NAME "minc2") 14 SET(PACKAGE_NAME "minc2")
15 SET(PACKAGE_VERSION "${MINC2_PACKAGE_VERSION_MAJOR}.${MINC2_PACKAGE_VERSION_MINOR}.${MINC2_PACKAGE_VERSION_PATCH}") 15 SET(PACKAGE_VERSION "${MINC2_PACKAGE_VERSION_MAJOR}.${MINC2_PACKAGE_VERSION_MINOR}.${MINC2_PACKAGE_VERSION_PATCH}")
16 SET(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") 16 SET(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
17 17
18
19 CMAKE_MINIMUM_REQUIRED(VERSION 2.6) 18 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
19
20 IF(MINC_TOOLKIT_BUILD)
21 SET(MINC2_EXTERNALLY_CONFIGURED ON)
22 ENDIF(MINC_TOOLKIT_BUILD)
20 23
21 IF(NOT MINC2_EXTERNALLY_CONFIGURED) 24 IF(NOT MINC2_EXTERNALLY_CONFIGURED)
22 SET(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules") 25 SET(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules")
23 ENABLE_TESTING() 26 ENABLE_TESTING()
24 INCLUDE(CTest) 27 INCLUDE(CTest)
310 ADD_LIBRARY(${VOLUME_IO_LIBRARY} ${LIBRARY_TYPE} ${volume_io_LIB_SRCS}) 313 ADD_LIBRARY(${VOLUME_IO_LIBRARY} ${LIBRARY_TYPE} ${volume_io_LIB_SRCS})
311 314
312 SET_TARGET_PROPERTIES(${MINC2_LIBRARY} PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION ${MINC2_PACKAGE_VERSION_MAJOR}) 315 SET_TARGET_PROPERTIES(${MINC2_LIBRARY} PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION ${MINC2_PACKAGE_VERSION_MAJOR})
313 SET_TARGET_PROPERTIES(${VOLUME_IO_LIBRARY} PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION ${MINC2_PACKAGE_VERSION_MAJOR}) 316 SET_TARGET_PROPERTIES(${VOLUME_IO_LIBRARY} PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION ${MINC2_PACKAGE_VERSION_MAJOR})
314 317
315 #ADD_DEPENDENCIES(${MINC2_LIBRARY} ${MINC2_DEPENDENCIES})
316 ADD_DEPENDENCIES(${VOLUME_IO_LIBRARY} ${MINC2_LIBRARY}) 318 ADD_DEPENDENCIES(${VOLUME_IO_LIBRARY} ${MINC2_LIBRARY})
317 319
318 INSTALL(TARGETS ${MINC2_LIBRARY} ${LIBRARY_INSTALL} DESTINATION lib) 320 INSTALL(TARGETS ${MINC2_LIBRARY} ${LIBRARY_INSTALL} DESTINATION lib)
319 INSTALL(TARGETS ${VOLUME_IO_LIBRARY} ${LIBRARY_INSTALL} DESTINATION lib) 321 INSTALL(TARGETS ${VOLUME_IO_LIBRARY} ${LIBRARY_INSTALL} DESTINATION lib)
320 INSTALL(FILES ${minc2_HEADERS} DESTINATION include ) 322 INSTALL(FILES ${minc2_HEADERS} DESTINATION include )