diff options
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | reporthandler.cpp | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 08b5a187f..8c4e21a5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,6 +59,9 @@ parser/rpp/pp-main.cpp parser/rpp/preprocessor.cpp ) +set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) +set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE) + qt4_add_resources(apiextractor_RCCS_SRC generator.qrc) qt4_automoc(apiextractor_SRC) @@ -104,8 +107,8 @@ enable_testing() add_subdirectory(tests) install(FILES ${root_HEADERS} DESTINATION include/apiextractor) -install(TARGETS apiextractor LIBRARY DESTINATION lib) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apiextractor.pc DESTINATION lib/pkgconfig) +install(TARGETS apiextractor LIBRARY DESTINATION ${LIB_INSTALL_DIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/apiextractor.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FindApiExtractor.cmake DESTINATION share/cmake-2.6/Modules) diff --git a/reporthandler.cpp b/reporthandler.cpp index c03100815..18a9a9c1e 100644 --- a/reporthandler.cpp +++ b/reporthandler.cpp @@ -83,7 +83,7 @@ void ReportHandler::progress(const QString& str, ...) void ReportHandler::printProgress() { - printf(m_progressBuffer); + printf("%s", m_progressBuffer); fflush(stdout); } |