cmake cosmetics

[lyx.git] / development / cmake / modules / LyXMacros.cmake

diff --git a/development/cmake/modules/LyXMacros.cmake b/development/cmake/modules/LyXMacros.cmake
index 0749961f1ca44ed4924142750ef5cca3e7758f91..609e83099506d03b5710dadbd41d1d47bc589ed1 100644 (file)
--- a/development/cmake/modules/LyXMacros.cmake
+++ b/development/cmake/modules/LyXMacros.cmake
@@ -42,7 +42,7 @@ macro (LYX_ADD_UI_FILES _sources _ui)
 
       get_filename_component(_tmp_FILE ${_current_FILE} ABSOLUTE)
       get_filename_component(_basename ${_tmp_FILE} NAME_WE)
-      set(_header ${CMAKE_CURRENT_BINARY_DIR}/ui/${_basename}.h)
+      set(_header ${CMAKE_CURRENT_BINARY_DIR}/ui_${_basename}.h)
 
       # we need to run uic and replace some things in the generated file
       # this is done by executing the cmake script kde4uic.cmake
@@ -66,7 +66,7 @@ endmacro (LYX_ADD_UI_FILES)
 MACRO (LYX_AUTOMOC)
    if(QT4_GET_MOC_INC_DIRS)
       QT4_GET_MOC_INC_DIRS(_moc_INCS)
-   endif(QT4_GET_MOC_INC_DIRS)
+   endif()
 
    set(_matching_FILES )
    foreach (_current_FILE ${ARGN})
@@ -117,11 +117,11 @@ MACRO (LYX_AUTOMOC)
                macro_add_file_dependencies(${_abs_FILE} ${_moc})
 
             endforeach (_current_MOC_INC)
-         else(_match)
+         else()
                #message(STATUS "moc not found : ${_abs_FILE} ")
-         endif (_match)
+         endif()
 
-      endif (EXISTS ${_abs_FILE} AND NOT _skip)
+      endif()
    endforeach (_current_FILE)
 endmacro (LYX_AUTOMOC)
 
@@ -137,32 +137,32 @@ macro(lyx_const_touched_files _allinone_name _list)
    set(_rebuild_file_const 0)
    if (NOT EXISTS ${_file_const})
       set(_rebuild_file_const 1)
-   else (NOT EXISTS ${_file_const})
+   else()
       FILE(READ ${_file_const} _file_content)
       if (NOT _file_content)
          set(_rebuild_file_const 1)
-      endif (NOT _file_content)
-   endif (NOT EXISTS ${_file_const})
+      endif()
+   endif()
    
    set(_rebuild_file_touched 0)
    if (NOT EXISTS ${_file_touched})
       set(_rebuild_file_touched 1)
-   else (NOT EXISTS ${_file_touched})
+   else()
       FILE(READ ${_file_touched} _file_content)
       if (NOT _file_content)
          set(_rebuild_file_touched 1)
-      endif (NOT _file_content)   
-   endif (NOT EXISTS ${_file_touched})
+      endif()   
+   endif()
    
    if (merge_rebuild)
       set(_rebuild_file_const 1)
       set(_rebuild_file_touched 1)
-   endif (merge_rebuild)
+   endif()
    
    if (_rebuild_file_const)
       file(WRITE  ${_file_const} "// autogenerated file \n//\n")
       file(APPEND ${_file_const} "//    * clear or delete this file to build it again by cmake \n//\n\n")
-   endif (_rebuild_file_const)
+   endif()
 
    if (_rebuild_file_touched)
       file(WRITE  ${_file_touched} "// autogenerated file \n//\n")
@@ -170,7 +170,7 @@ macro(lyx_const_touched_files _allinone_name _list)
       file(APPEND ${_file_touched} "//    * don't touch this file \n//\n\n")
       file(APPEND ${_file_touched} "#define DONT_INCLUDE_CONST_FILES\n")
       file(APPEND ${_file_touched} "#include \"${_file_const}\"\n\n\n")
-   endif (_rebuild_file_touched)
+   endif()
    
    set(${_file_list} ${_file_const} ${_file_touched})
    
@@ -181,7 +181,7 @@ macro(lyx_const_touched_files _allinone_name _list)
       get_source_file_property(_isGenerated ${_abs_FILE} GENERATED)
       if (_isGenerated)
          list(APPEND ${_file_list} ${_abs_FILE})
-      else (_isGenerated)
+      else()
         GET_FILENAME_COMPONENT(_file_name ${_abs_FILE} NAME_WE)
         STRING(REGEX REPLACE "-" "_" _file_name "${_file_name}" )
         set(__macro_name ${_file_name}___ASSUME_CONST)
@@ -191,14 +191,14 @@ macro(lyx_const_touched_files _allinone_name _list)
            file(APPEND ${_file_const}  "#if defined(${__macro_name}) && !defined(DONT_INCLUDE_CONST_FILES)\n")
            file(APPEND ${_file_const}  "#include \"${_abs_FILE}\"\n")
            file(APPEND ${_file_const}  "#endif\n\n")
-        endif (_rebuild_file_const)
+        endif()
         
         if (_rebuild_file_touched)
            file(APPEND ${_file_touched}  "#ifndef ${__macro_name}\n")
            file(APPEND ${_file_touched}  "#include \"${_abs_FILE}\"\n")
            file(APPEND ${_file_touched}  "#endif\n\n")
-        endif (_rebuild_file_touched)
-      endif (_isGenerated)
+        endif()
+      endif()
    endforeach (_current_FILE)
 endmacro(lyx_const_touched_files)