diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-06-23 16:46:40 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-06-23 17:08:49 -0300 |
| commit | 2e58a6d67c38ef627c1065fca61c3602a1eb49d0 (patch) | |
| tree | d2894d40b0a23aebe793a8760a8e54a8bb2b30b2 | |
| parent | a6e5c09a32b7f5eff5dd35664bb4bf8fa55886ed (diff) | |
Fix cmake files used by other projects to detect Generator Runner.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Renato Araújo <renato.filho@openbossa.org>
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | GeneratorRunnerConfigVersion.cmake.in (renamed from GeneratorRunnerVersion.cmake.in) | 0 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f359dbeb1..6bf91efdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(generatorrunner) cmake_minimum_required(VERSION 2.6) find_package(Qt4 4.5.0 REQUIRED) -find_package(ApiExtractor REQUIRED) +find_package(ApiExtractor 0.6 REQUIRED) option(BUILD_TESTS "Build tests." TRUE) @@ -68,8 +68,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/generatorrunner.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/generatorrunner.pc" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/GeneratorRunnerConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/GeneratorRunnerConfig.cmake" @ONLY) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/GeneratorRunnerVersion.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/GeneratorRunnerVersion.cmake" @ONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/GeneratorRunnerConfigVersion.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/GeneratorRunnerConfigVersion.cmake" @ONLY) # uninstall target configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake" @@ -100,7 +100,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/generatorrunner.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/GeneratorRunnerConfig.cmake" DESTINATION "${LIB_INSTALL_DIR}/cmake/GeneratorRunner-${generator_VERSION}") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/GeneratorRunnerVersion.cmake" +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/GeneratorRunnerConfigVersion.cmake" DESTINATION "${LIB_INSTALL_DIR}/cmake/GeneratorRunner-${generator_VERSION}") #FIXME: manpages should be installed only on Linux targets diff --git a/GeneratorRunnerVersion.cmake.in b/GeneratorRunnerConfigVersion.cmake.in index fe0e36e59..fe0e36e59 100644 --- a/GeneratorRunnerVersion.cmake.in +++ b/GeneratorRunnerConfigVersion.cmake.in |