diff options
| -rw-r--r-- | Modules/FindFLTK.cmake | 5 | ||||
| -rw-r--r-- | Modules/FindQt.cmake | 10 | ||||
| -rw-r--r-- | Source/cmFLTKWrapUICommand.cxx | 16 | ||||
| -rw-r--r-- | Source/cmQTWrapCPPCommand.cxx | 15 |
4 files changed, 0 insertions, 46 deletions
diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake index 5152ae7..6680d7a 100644 --- a/Modules/FindFLTK.cmake +++ b/Modules/FindFLTK.cmake @@ -3,7 +3,6 @@ # # The following settings are defined # FLTK_FLUID_EXECUTABLE, where to find the Fluid tool -# FLTK_WRAP_UI, This allows the FLTK_WRAP_UI command to work. # FLTK_INCLUDE_DIR, where to find include files # FLTK_LIBRARIES, list of fltk libraries # FLTK_VERSION_1.0.11 Use this Version @@ -103,10 +102,6 @@ ENDIF(FLTK_INCLUDE_DIR) FIND_PROGRAM(FLTK_FLUID_EXECUTABLE fluid ${path} ${FLTK_INCLUDE_DIR}/fluid ) -# Enable the Wrap UI command -IF (FLTK_FLUID_EXECUTABLE) - SET ( FLTK_WRAP_UI 1 CACHE INTERNAL "Can we honour the FLTK_WRAP_UI command" ) -ENDIF (FLTK_FLUID_EXECUTABLE) # # Set FLTK_FOUND diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake index 995d43f..b9335d0 100644 --- a/Modules/FindQt.cmake +++ b/Modules/FindQt.cmake @@ -4,8 +4,6 @@ # QT_INCLUDE_DIR, where to find qt.h, etc. # QT_LIBRARIES, the libraries to link against to use Qt. # QT_DEFINITIONS, definitions to use when compiling code that uses Qt. -# QT_WRAP_CPP, If false, don't use QT_WRAP_CPP command. -# QT_WRAP_UI, If false, don't use QT_WRAP_UI command. # QT_FOUND, If false, don't try to use Qt. # also defined, but not for general use are @@ -72,14 +70,6 @@ IF (WIN32) ENDIF (WIN32) -IF (QT_MOC_EXECUTABLE) - SET ( QT_WRAP_CPP "YES") -ENDIF (QT_MOC_EXECUTABLE) - -IF (QT_UIC_EXECUTABLE) - SET ( QT_WRAP_UI "YES") -ENDIF (QT_UIC_EXECUTABLE) - IF(QT_INCLUDE_DIR) IF(QT_QT_LIBRARY) diff --git a/Source/cmFLTKWrapUICommand.cxx b/Source/cmFLTKWrapUICommand.cxx index f39d1ec..bdae514 100644 --- a/Source/cmFLTKWrapUICommand.cxx +++ b/Source/cmFLTKWrapUICommand.cxx @@ -27,22 +27,6 @@ bool cmFLTKWrapUICommand::InitialPass(std::vector<std::string> const& args) return false; } - // Now check and see if the value has been stored in the cache - // already, if so use that value and don't look for the program - const char* FLTK_WRAP_UI_value = m_Makefile->GetDefinition("FLTK_WRAP_UI"); - if (FLTK_WRAP_UI_value==0) - { - this->SetError("called with FLTK_WRAP_UI undefined"); - return false; - } - - if(cmSystemTools::IsOff(FLTK_WRAP_UI_value)) - { - this->SetError("called with FLTK_WRAP_UI off : "); - return false; - } - - // what is the current source dir std::string cdir = m_Makefile->GetCurrentDirectory(); std::string fluid_exe = "${FLTK_FLUID_EXECUTABLE}"; diff --git a/Source/cmQTWrapCPPCommand.cxx b/Source/cmQTWrapCPPCommand.cxx index 6bc9798..9f74a71 100644 --- a/Source/cmQTWrapCPPCommand.cxx +++ b/Source/cmQTWrapCPPCommand.cxx @@ -27,21 +27,6 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn) std::vector<std::string> args; m_Makefile->ExpandSourceListArguments(argsIn, args, 2); - // Now check and see if the value has been stored in the cache - // already, if so use that value and don't look for the program - const char* QT_WRAP_CPP_value = m_Makefile->GetDefinition("QT_WRAP_CPP"); - if (QT_WRAP_CPP_value==0) - { - this->SetError("called with QT_WRAP_CPP undefined"); - return false; - } - - if(cmSystemTools::IsOff(QT_WRAP_CPP_value)) - { - this->SetError("called with QT_WRAP_CPP off : "); - return false; - } - // what is the current source dir std::string cdir = m_Makefile->GetCurrentDirectory(); |