Browse Source

clean up commands so they don't need extra variable

Bill Hoffman 21 years ago
parent
commit
6ccbfe9795
4 changed files with 0 additions and 46 deletions
  1. 0 5
      Modules/FindFLTK.cmake
  2. 0 10
      Modules/FindQt.cmake
  3. 0 16
      Source/cmFLTKWrapUICommand.cxx
  4. 0 15
      Source/cmQTWrapCPPCommand.cxx

+ 0 - 5
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

+ 0 - 10
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)

+ 0 - 16
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}";

+ 0 - 15
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();