mirror of
https://bitbucket.org/smil3y/kde-extraapps.git
synced 2025-02-24 02:42:52 +00:00
kdevelop: replace KDE4_BUILD_TESTS with ENABLE_TESTING
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
2e8a411109
commit
1b7de2a878
3 changed files with 3 additions and 6 deletions
|
@ -174,7 +174,7 @@ CMakeProjectData CMakeLoadProjectTest::parseProject( const QString& sourcedir )
|
|||
data.vm.insert("CMAKE_CURRENT_BINARY_DIR", QStringList(sourcedir));
|
||||
data.vm.insert("CMAKE_CURRENT_LIST_FILE", QStringList(projectfile));
|
||||
data.vm.insert("CMAKE_CURRENT_SOURCE_DIR", QStringList(sourcedir));
|
||||
data.vm.insert("KDE4_BUILD_TESTS", QStringList("True"));
|
||||
data.vm.insert("ENABLE_TESTING", QStringList("True"));
|
||||
|
||||
CMakeProjectVisitor v(projectfile, ref);
|
||||
v.setVariableMap(&data.vm);
|
||||
|
|
|
@ -112,7 +112,7 @@ target_link_libraries( #{targetName}
|
|||
kdevplatform
|
||||
kdevcmakecommon )
|
||||
add_test( #{targetName} ${EXECUTABLE_OUTPUT_PATH}/#{targetName} )
|
||||
endif(KDE4_BUILD_TESTS)
|
||||
endif(ENABLE_TESTING)
|
||||
|
||||
CMAKE_EOF
|
||||
|
||||
|
@ -128,7 +128,7 @@ puts "Adding build system bits to CMakeLists.txt"
|
|||
cmakeList = File.new("CMakeLists.txt", "r+")
|
||||
oldCMakeText = cmakeList.read;
|
||||
cmakeList.close;
|
||||
oldCMakeText.gsub!(/endif\(KDE4_BUILD_TESTS\)/, cmakeText)
|
||||
oldCMakeText.gsub!(/endif\(ENABLE_TESTING\)/, cmakeText)
|
||||
cmakeList = File.new("CMakeLists.txt", "w")
|
||||
cmakeList.write(oldCMakeText)
|
||||
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
project(unittestskde)
|
||||
|
||||
enable_testing()
|
||||
set(KDE4_BUILD_TESTS ON)
|
||||
|
||||
find_package(KDE4 REQUIRED)
|
||||
|
||||
include_directories( ${KDE4_INCLUDES} ${QT_INCLUDES} )
|
||||
|
|
Loading…
Add table
Reference in a new issue