diff --git a/Applications/PluginGenerator/CMakeLists.txt b/Applications/PluginGenerator/CMakeLists.txt index 44dba01603..2d3c8c92b9 100644 --- a/Applications/PluginGenerator/CMakeLists.txt +++ b/Applications/PluginGenerator/CMakeLists.txt @@ -1,77 +1,77 @@ cmake_minimum_required(VERSION 2.8.4) project(MITKPluginGenerator) set(VERSION_MAJOR 1) -set(VERSION_MINOR 2) +set(VERSION_MINOR 3) set(VERSION_PATCH 0) set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) set(standalone_build 1) else() set(standalone_build 0) endif() #----------------------------------------------------------------------------- -# Prerequesites +# Prerequisites #----------------------------------------------------------------------------- set(QT_DONT_USE_QTGUI 1) set(QT_USE_QTNETWORK 1) find_package(Qt 4.6.2 REQUIRED) include(${QT_USE_FILE}) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/PluginGeneratorConfig.h.in" "${CMAKE_CURRENT_BINARY_DIR}/PluginGeneratorConfig.h" @ONLY) include_directories("${CMAKE_CURRENT_BINARY_DIR}") #----------------------------------------------------------------------------- # Executable #----------------------------------------------------------------------------- set(src_files PluginGenerator.cpp ctkCommandLineParser.cpp ) qt4_wrap_cpp(src_files ctkCommandLineParser.h) qt4_add_resources(src_files plugin_template.qrc project_template.qrc) set(exec_target ${PROJECT_NAME}) add_executable(${exec_target} ${src_files}) target_link_libraries(${exec_target} ${QT_LIBRARIES}) if(NOT standalone_build) # subproject support add_dependencies(MITK-CoreUI ${exec_target}) endif() #----------------------------------------------------------------------------- # Win32 Convenience #----------------------------------------------------------------------------- if(WIN32 AND NOT standalone_build) file(TO_NATIVE_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}" native_runtime_dir) add_custom_target(NewPlugin start "MITK PluginGenerator" /D "${native_runtime_dir}" cmd /K ${exec_target}.exe -h DEPENDS ${exec_target}) endif() #----------------------------------------------------------------------------- # Testing #----------------------------------------------------------------------------- if(NOT standalone_build) # Test the plugin generator include(mitkTestPluginGenerator) endif() #----------------------------------------------------------------------------- # Packaging support #----------------------------------------------------------------------------- if(standalone_build) include(SetupPackaging.cmake) endif() diff --git a/Applications/PluginGenerator/Changelog.txt b/Applications/PluginGenerator/Changelog.txt index 72a22cf6b9..85bc88326e 100644 --- a/Applications/PluginGenerator/Changelog.txt +++ b/Applications/PluginGenerator/Changelog.txt @@ -1,36 +1,45 @@ This is the change log for the MITK Plugin Generator +Changes since version 1.2.0 +====================================================================== + +Changes in the generated files +---------------------------------------------------------------------- + +- Added gcc linker flag --as-needed to get same behavior as on Windows +- Improved MITK superbuild configuration options + Changes since version 1.1.1 ====================================================================== Changes in the MITKPluginGenerator executable ---------------------------------------------------------------------- - Added a visual clue in the help text about required arguments. - Added support for checking for new versions online. Changes in the generated files ---------------------------------------------------------------------- - The plug-in activator class and file name are now derived from the plug-in symbolic name. - Adapted to changes in CTK CMake macros. - Improved generated superbuild script to correctly pass -j options. - Using new BlueBerry FunctionCreateBlueBerryApplication() macro to create the demo application. Changes since version 1.0.0 ====================================================================== Changes in the MITKPluginGenerator executable ---------------------------------------------------------------------- - Added printing the version number to the console. - Added hint how to get more help if something went wrong. Changes in the generated files ---------------------------------------------------------------------- - Fixed user manual for the generated plugin. - Added comments in the generated project's CMakeLists.txt file about how to set-up the MITK module system.