Mercurial > hg > minc-tools
changeset 2658:c09787b85240
Fixing warning in EZminc
| author | Vladimir S. FONOV <vladimir.fonov@gmail.com> |
|---|---|
| date | Thu, 29 Mar 2012 17:16:26 -0400 |
| parents | 5857c4de2150 |
| children | d49870395329 |
| files | CMakeLists.txt ezminc/minc_io_exceptions.h |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,8 +15,11 @@ SET(PACKAGE_VERSION "${MINC2_PACKAGE_VERSION_MAJOR}.${MINC2_PACKAGE_VERSION_MINOR}.${MINC2_PACKAGE_VERSION_PATCH}") SET(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) +IF(MINC_TOOLKIT_BUILD) + SET(MINC2_EXTERNALLY_CONFIGURED ON) +ENDIF(MINC_TOOLKIT_BUILD) IF(NOT MINC2_EXTERNALLY_CONFIGURED) SET(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules") @@ -312,7 +315,6 @@ SET_TARGET_PROPERTIES(${MINC2_LIBRARY} PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION ${MINC2_PACKAGE_VERSION_MAJOR}) SET_TARGET_PROPERTIES(${VOLUME_IO_LIBRARY} PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION ${MINC2_PACKAGE_VERSION_MAJOR}) -#ADD_DEPENDENCIES(${MINC2_LIBRARY} ${MINC2_DEPENDENCIES}) ADD_DEPENDENCIES(${VOLUME_IO_LIBRARY} ${MINC2_LIBRARY}) INSTALL(TARGETS ${MINC2_LIBRARY} ${LIBRARY_INSTALL} DESTINATION lib)
--- a/ezminc/minc_io_exceptions.h +++ b/ezminc/minc_io_exceptions.h @@ -28,8 +28,8 @@ int _code; public: - generic_error (const char *file, int line, const char *msg = "Error", int code = 0): - _file (file), _line (line), _msg (msg), _code (code) + generic_error (const char *file__, int line__, const char *msg__ = "Error", int code__ = 0): + _file (file__), _line (line__), _msg (msg__), _code (code__) { // std::cerr<<"Exception created: "<<_file<<":"<<_line<<" "<<_msg<<std::endl; }