r21542 by craig - Replace old style end/endif CMake syntax with newer
scribus-commit
scribus-commit at lists.scribus.net
Sun Nov 27 20:25:28 UTC 2016
Author: craig
Date: Sun Nov 27 20:25:28 2016
New Revision: 21542
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21542
Log:
Replace old style end/endif CMake syntax with newer
Modified:
trunk/Scribus/scribus/CMakeLists.txt
trunk/Scribus/scribus/designer/CMakeLists.txt
trunk/Scribus/scribus/designer/smwidgets/CMakeLists.txt
trunk/Scribus/scribus/plugins/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt
trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
trunk/Scribus/scribus/plugins/tools/CMakeLists.txt
trunk/Scribus/scribus/relaxng/CMakeLists.txt
trunk/Scribus/scribus/third_party/CMakeLists.txt
Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -7,7 +7,7 @@
IF (NOT CMAKE_VERSION VERSION_LESS "3.2.0")
add_custom_target(svnheader ALL COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_MODULE_PATH}/getsvn.cmake BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h)
- ELSE (NOT CMAKE_VERSION VERSION_LESS "3.2.0")
+ ELSE ()
add_custom_target(svnheader ALL DEPENDS svn_header ) # svn_header is nothing more than a unique string
# creates svnheader.h using cmake script
@@ -17,12 +17,12 @@
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
PROPERTIES GENERATED TRUE
HEADER_FILE_ONLY TRUE)
- ENDIF (NOT CMAKE_VERSION VERSION_LESS "3.2.0")
-ENDIF (WANT_SVNVERSION)
+ ENDIF ()
+ENDIF ()
IF(WIN32)
ADD_DEFINITIONS(-DQT_DLL)
-ENDIF(WIN32)
+ENDIF()
ADD_SUBDIRECTORY(dtd)
ADD_SUBDIRECTORY(colormgmt)
@@ -33,11 +33,11 @@
ADD_SUBDIRECTORY(ui/qml)
IF(WITH_TESTS)
ADD_SUBDIRECTORY(tests)
-ENDIF(WITH_TESTS)
+ENDIF()
ADD_SUBDIRECTORY(unicodemap)
IF (WANT_DESIGNER)
ADD_SUBDIRECTORY(designer)
-ENDIF (WANT_DESIGNER)
+ENDIF ()
ADD_SUBDIRECTORY(third_party)
IF(HAVE_OSG)
@@ -54,13 +54,13 @@
ui/osgeditor.cpp
pageitem_osgframe.cpp
)
-ENDIF (HAVE_OSG)
+ENDIF ()
IF (GMAGICK_FOUND)
SET(SCRIBUS_GMAGICK_SRC imagedataloaders/scimgdataloader_gmagick.cpp)
-ELSE(GMAGICK_FOUND)
+ELSE()
SET(SCRIBUS_GMAGICK_SRC)
-ENDIF(GMAGICK_FOUND)
+ENDIF()
# We setup something like a group to gather setter related stuff
# because it could expand into a huge amount of files at some point.
@@ -1018,7 +1018,7 @@
third_party/hyphen/hnjalloc.c
third_party/hyphen/hyphen.c
)
-ENDIF(NOT HAVE_HYPHEN)
+ENDIF()
@@ -1029,11 +1029,11 @@
scprintengine_gdi.cpp
)
SET(SCRIBUS_MAIN_CPP main_win32.cpp)
-ELSE(WIN32)
+ELSE()
SET(SCRIBUS_MOC_WIN32_ONLY_CLASSES)
SET(SCRIBUS_WIN32_ONLY_SOURCES)
SET(SCRIBUS_MAIN_CPP main.cpp)
-ENDIF(WIN32)
+ENDIF()
QT5_WRAP_UI(SCRIBUS_UI_SOURCES ${SCRIBUS_UI_SRC} )
@@ -1056,32 +1056,32 @@
IF(WITH_TESTS)
LINK_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/tests )
-ENDIF(WITH_TESTS)
+ENDIF()
IF(HAVE_OSG)
LINK_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/third_party/prc )
-ENDIF (HAVE_OSG)
+ENDIF ()
IF(HAVE_BOOST)
LINK_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/third_party/lib2geom )
-ENDIF (HAVE_BOOST)
+ENDIF ()
SET(SCRIBUS_COLORMGMT_LIB "scribus_colormgmt_lib")
SET(SCRIBUS_TEXT_LIB "scribus_text_lib")
IF(WITH_TESTS)
SET(SCRIBUS_TESTS_LIB "scribus_tests_lib")
-ELSE(WITH_TESTS)
+ELSE()
SET(SCRIBUS_TESTS_LIB "")
-ENDIF(WITH_TESTS)
+ENDIF()
SET(SCRIBUS_STYLES_LIB "scribus_styles_lib")
SET(SCRIBUS_FONTS_LIB "scribus_fonts_lib")
SET(SCRIBUS_DESAXE_LIB "scribus_desaxe_lib")
IF(HAVE_OSG)
SET(SCRIBUS_PRC_LIB "scribus_prc_lib")
-ENDIF (HAVE_OSG)
+ENDIF ()
IF(HAVE_BOOST)
SET(SCRIBUS_2GEOM_LIB "scribus_2geom_lib")
-ENDIF (HAVE_BOOST)
+ENDIF ()
SET(SCRIBUS_WPG_LIB "scribus_wpg_lib")
SET(SCRIBUS_PGF_LIB "scribus_pgf_lib")
SET(SCRIBUS_ZIP_LIB "scribus_zip_lib")
@@ -1102,36 +1102,36 @@
LINK_DIRECTORIES(
${GMAGICK_LIBRARY}
)
-ENDIF(GMAGICK_FOUND)
+ENDIF()
IF(HAVE_PODOFO)
INCLUDE_DIRECTORIES(
${LIBPODOFO_INCLUDE_DIR}
)
-ENDIF(HAVE_PODOFO)
+ENDIF()
IF(HAVE_HYPHEN)
TARGET_LINK_LIBRARIES(${EXE_NAME}
${HYPHEN_LIBRARY}
)
-ENDIF(HAVE_HYPHEN)
+ENDIF()
IF(GESTURE_FRAME_PREVIEW)
MESSAGE(STATUS "Enable gesture frame preview [experimental]")
SET(GESTURE_FRAME_PREVIEW_SOURCES pageitempreview.cpp)
ADD_DEFINITIONS(-DGESTURE_FRAME_PREVIEW)
-ENDIF(GESTURE_FRAME_PREVIEW)
+ENDIF()
IF(APPLEBUNDLE)
SET(EXE_NAME "Scribus${TAG_VERSION}" CACHE TYPE STRING)
-ELSE(APPLEBUNDLE)
+ELSE()
SET(EXE_NAME "scribus${TAG_VERSION}" CACHE TYPE STRING)
-ENDIF(APPLEBUNDLE)
+ENDIF()
IF(COMMAND cmake_policy)
cmake_policy(SET CMP0003 OLD)
-ENDIF(COMMAND cmake_policy)
+ENDIF()
IF(HAVE_OSG)
ADD_EXECUTABLE(${EXE_NAME}
@@ -1148,7 +1148,7 @@
${GESTURE_FRAME_PREVIEW_SOURCES}
${SCRIBUS_PRC_SOURCES}
)
-ELSE(HAVE_OSG)
+ELSE()
ADD_EXECUTABLE(${EXE_NAME}
${SCRIBUS_MOC_SOURCES}
${SCRIBUS_SOURCES}
@@ -1162,7 +1162,7 @@
${SCRIBUS_WIN32_ONLY_SOURCES}
${GESTURE_FRAME_PREVIEW_SOURCES}
)
-ENDIF (HAVE_OSG)
+ENDIF ()
IF(WIN32)
SET_TARGET_PROPERTIES(${EXE_NAME}
@@ -1171,9 +1171,9 @@
ENABLE_EXPORTS TRUE
)
SET(WIN32_ONLY_LIBS mscms.lib)
-ELSE(WIN32)
+ELSE()
SET(WIN32_ONLY_LIBS)
-ENDIF(WIN32)
+ENDIF()
##TEST FIX FOR 6897
IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
@@ -1182,14 +1182,14 @@
# be set as SCRIBUS_API if we're building with -fvisibility=hidden .
# Should fix bug 6897 .
SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
-ENDIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+ENDIF ()
IF (GCC AND NOT WIN32)
# Use the -E / --export-dynamic flag to ensure that symbols in the Scribus
# binary are in the public symbol table for plugins. The symbols must also
# be set as SCRIBUS_API if we're building with -fvisibility=hidden .
# Should fix bug 6897 .
SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
-ENDIF (GCC AND NOT WIN32)
+ENDIF ()
##
@@ -1230,32 +1230,32 @@
TARGET_LINK_LIBRARIES(${EXE_NAME}
${CUPS_LIBRARIES}
)
-ENDIF (NOT WIN32 AND NOT HAIKU)
+ENDIF ()
# required to resolve symbols from libdl when ld is called with --no-add-needed
# #9310 for the OpenBSD addition
IF(UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT HAIKU)
TARGET_LINK_LIBRARIES(${EXE_NAME} dl)
-ENDIF(UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT HAIKU)
+ENDIF()
# #9311 for the OpenBSD addition
IF(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
TARGET_LINK_LIBRARIES(${EXE_NAME} util execinfo)
-ENDIF(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ENDIF()
IF(WIN32)
TARGET_LINK_LIBRARIES(${EXE_NAME} ${QT_QTMAIN_LIBRARY})
-ENDIF(WIN32)
+ENDIF()
IF(APPLE)
TARGET_LINK_LIBRARIES(${EXE_NAME}
"-undefined dynamic_lookup"
"-framework CoreFoundation" )
-ENDIF(APPLE)
+ENDIF()
IF (WANT_SVNVERSION)
add_dependencies(${EXE_NAME} svnheader)
-ENDIF (WANT_SVNVERSION)
+ENDIF ()
TARGET_LINK_LIBRARIES(${EXE_NAME}
${SCRIBUS_COLORMGMT_LIB}
@@ -1275,13 +1275,13 @@
${QT_QTTEST_LIBRARY}
${SCRIBUS_TESTS_LIB}
)
-ENDIF(WITH_TESTS)
+ENDIF()
IF(HAVE_PODOFO)
TARGET_LINK_LIBRARIES(${EXE_NAME}
${LIBPODOFO_LIBRARY}
)
-ENDIF(HAVE_PODOFO)
+ENDIF()
IF(HAVE_OSG)
TARGET_LINK_LIBRARIES(${EXE_NAME}
@@ -1294,13 +1294,13 @@
${OSGTEXT_LIBRARY}
${SCRIBUS_PRC_LIB}
)
-ENDIF(HAVE_OSG)
+ENDIF()
IF (HAVE_BOOST)
TARGET_LINK_LIBRARIES(${EXE_NAME}
${SCRIBUS_2GEOM_LIB}
)
-ENDIF(HAVE_BOOST)
+ENDIF()
# Now build plugins
@@ -1325,13 +1325,13 @@
${PLUGIN_LIBRARIES}
${EXE_NAME}
)
-ENDIF(WIN32)
+ENDIF()
IF(APPLE)
SET(PLUGIN_LIBRARIES
${PLUGIN_LIBRARIES}
"-undefined dynamic_lookup"
)
-ENDIF(APPLE)
+ENDIF()
MESSAGE(STATUS ${PLUGIN_LIBRARIES})
ADD_SUBDIRECTORY(plugins)
@@ -1358,19 +1358,19 @@
# " COMPONENT Runtime)
-ELSE(APPLEBUNDLE)
+ELSE()
IF(WIN32)
INSTALL(TARGETS ${EXE_NAME}
RUNTIME DESTINATION .
LIBRARY DESTINATION ${LIB_DIR_NAME}
)
- ELSE(WIN32)
+ ELSE()
INSTALL(TARGETS ${EXE_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION ${LIB_DIR_NAME}
)
- ENDIF(WIN32)
-ENDIF(APPLEBUNDLE)
+ ENDIF()
+ENDIF()
#Install our header files, selected from all existing dirs, excluding unwanted directories and svn files
IF(WANT_HEADERINSTALL)
@@ -1387,9 +1387,9 @@
PATTERN "old" EXCLUDE
PATTERN ".svn" EXCLUDE
)
-ELSE(WANT_HEADERINSTALL)
+ELSE()
MESSAGE(STATUS "No source header files will be installed")
-ENDIF(WANT_HEADERINSTALL)
+ENDIF()
#Install our stylesheet
INSTALL(FILES
Modified: trunk/Scribus/scribus/designer/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/designer/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/designer/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/designer/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -69,7 +69,7 @@
TARGET_LINK_LIBRARIES(${SCRIBUS_SCRSPINBOX_PLUGIN} "-undefined dynamic_lookup")
TARGET_LINK_LIBRARIES(${SCRIBUS_SCTABLEWIDGET_PLUGIN} "-undefined dynamic_lookup")
TARGET_LINK_LIBRARIES(${SCRIBUS_SCTEXTBROWSER_PLUGIN} "-undefined dynamic_lookup")
-ENDIF(APPLE)
+ENDIF()
# install it manually
#INSTALL(TARGETS ${SCRIBUS_SCRSPINBOX_PLUGIN}
Modified: trunk/Scribus/scribus/designer/smwidgets/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/designer/smwidgets/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/designer/smwidgets/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/designer/smwidgets/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -205,4 +205,4 @@
TARGET_LINK_LIBRARIES(${SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN} "-undefined dynamic_lookup")
TARGET_LINK_LIBRARIES(${SCRIBUS_SMTABRULERPLUGIN_PLUGIN} "-undefined dynamic_lookup")
-ENDIF(APPLE)
+ENDIF()
Modified: trunk/Scribus/scribus/plugins/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/plugins/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -12,12 +12,12 @@
IF(NOT WIN32)
MESSAGE(STATUS "Building with Scripter 1")
ADD_SUBDIRECTORY(scriptplugin)
- ENDIF(NOT WIN32)
-ELSE(NOT WANT_SCRIPTER2)
+ ENDIF()
+ELSE()
#scripter2
MESSAGE(STATUS "Building with Scripter 2")
ADD_SUBDIRECTORY(scripter)
-ENDIF(NOT WANT_SCRIPTER2)
+ENDIF()
ADD_SUBDIRECTORY(short-words)
ADD_SUBDIRECTORY(tools)
ADD_SUBDIRECTORY(picbrowser)
Modified: trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -6,12 +6,12 @@
ADD_SUBDIRECTORY(htmlim)
# ADD_SUBDIRECTORY(odtim)
ADD_SUBDIRECTORY(odt2im)
-ENDIF(HAVE_XML)
+ENDIF()
ADD_SUBDIRECTORY(pdbim)
ADD_SUBDIRECTORY(rtfim)
IF(HAVE_XML)
ADD_SUBDIRECTORY(sxwim)
-ENDIF(HAVE_XML)
+ENDIF()
ADD_SUBDIRECTORY(textfilter)
ADD_SUBDIRECTORY(txtim)
ADD_SUBDIRECTORY(xtgim)
Modified: trunk/Scribus/scribus/plugins/import/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/plugins/import/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -12,9 +12,9 @@
ADD_SUBDIRECTORY(pct)
IF(HAVE_POPPLER)
ADD_SUBDIRECTORY(pdf)
-ELSE(HAVE_POPPLER)
+ELSE()
ADD_SUBDIRECTORY(ps)
-ENDIF(HAVE_POPPLER)
+ENDIF()
# ADD_SUBDIRECTORY(pgs)
# ADD_SUBDIRECTORY(ppp)
ADD_SUBDIRECTORY(pm)
Modified: trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -8,7 +8,7 @@
INCLUDE_DIRECTORIES(
${LIBPODOFO_INCLUDE_DIR}
)
-ENDIF(HAVE_PODOFO)
+ENDIF()
SET(IMPORTAI_PLUGIN_MOC_CLASSES
importai.h
@@ -32,15 +32,15 @@
${TIFF_LIBRARIES}
${JPEG_LIBRARIES}
)
-ELSE(WIN32)
+ELSE()
TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTAI_PLUGIN} ${PLUGIN_LIBRARIES})
-ENDIF(WIN32)
+ENDIF()
IF(HAVE_PODOFO)
TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTAI_PLUGIN}
${LIBPODOFO_LIBRARY}
)
-ENDIF(HAVE_PODOFO)
+ENDIF()
INSTALL(TARGETS ${SCRIBUS_IMPORTAI_PLUGIN}
LIBRARY
Modified: trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -12,8 +12,8 @@
TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTCDR_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBCDR_LDFLAGS})
INSTALL(TARGETS ${SCRIBUS_IMPORTCDR_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
ADD_DEPENDENCIES(${SCRIBUS_IMPORTCDR_PLUGIN} ${EXE_NAME})
- ENDIF (LIBCDR_FOUND)
-ELSE (HAVE_REVENGE)
+ ENDIF ()
+ELSE ()
pkg_check_modules(LIBWPG libwpg-0.2)
IF (LIBWPG_FOUND)
pkg_check_modules(LIBWPD libwpd-0.9)
@@ -31,8 +31,8 @@
TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTCDR_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBCDR_LDFLAGS})
INSTALL(TARGETS ${SCRIBUS_IMPORTCDR_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
ADD_DEPENDENCIES(${SCRIBUS_IMPORTCDR_PLUGIN} ${EXE_NAME})
- ENDIF (LIBCDR_FOUND)
- ENDIF (LIBWPD_STREAM_FOUND)
- ENDIF (LIBWPD_FOUND)
- ENDIF (LIBWPG_FOUND)
-ENDIF (HAVE_REVENGE)
+ ENDIF ()
+ ENDIF ()
+ ENDIF ()
+ ENDIF ()
+ENDIF ()
Modified: trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -12,5 +12,5 @@
TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTFH_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBFREEHAND_LDFLAGS})
INSTALL(TARGETS ${SCRIBUS_IMPORTFH_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
ADD_DEPENDENCIES(${SCRIBUS_IMPORTFH_PLUGIN} ${EXE_NAME})
- ENDIF (LIBFREEHAND_FOUND)
-ENDIF (HAVE_REVENGE)
+ ENDIF ()
+ENDIF ()
Modified: trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -12,8 +12,8 @@
# TARGET_LINK_LIBRARIES(${IMPORTPAGES_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBETONYEK_LDFLAGS})
# INSTALL(TARGETS ${IMPORTPAGES_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
# ADD_DEPENDENCIES(${IMPORTPAGES_PLUGIN} ${EXE_NAME})
-# ENDIF (LIBETONYEK_FOUND)
-#ENDIF (HAVE_REVENGE)
+# ENDIF ()
+#ENDIF ()
INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}
Modified: trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -25,9 +25,9 @@
IF(HAVE_POPPLER)
IF(HAVE_LCMS1)
ADD_DEFINITIONS(-DUSE_CMS)
- ENDIF(HAVE_LCMS1)
+ ENDIF()
ADD_DEFINITIONS(-DHAVE_FREETYPE_H)
-ENDIF(HAVE_POPPLER)
+ENDIF()
SET(SCRIBUS_IMPORTPDF_PLUGIN "importpdf")
Modified: trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -12,5 +12,5 @@
TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPM_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBPAGEMAKER_LDFLAGS})
INSTALL(TARGETS ${SCRIBUS_IMPORTPM_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
ADD_DEPENDENCIES(${SCRIBUS_IMPORTPM_PLUGIN} ${EXE_NAME})
- ENDIF (LIBPAGEMAKER_FOUND)
-ENDIF (HAVE_REVENGE)
+ ENDIF ()
+ENDIF ()
Modified: trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -8,7 +8,7 @@
INCLUDE_DIRECTORIES(
${LIBPODOFO_INCLUDE_DIR}
)
-ENDIF(HAVE_PODOFO)
+ENDIF()
SET(IMPORTPS_PLUGIN_MOC_CLASSES
importps.h
@@ -32,7 +32,7 @@
TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPS_PLUGIN}
${LIBPODOFO_LIBRARY}
)
-ENDIF(HAVE_PODOFO)
+ENDIF()
INSTALL(TARGETS ${SCRIBUS_IMPORTPS_PLUGIN}
LIBRARY
Modified: trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -12,8 +12,8 @@
TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPUB_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBMSPUB_LDFLAGS})
INSTALL(TARGETS ${SCRIBUS_IMPORTPUB_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
ADD_DEPENDENCIES(${SCRIBUS_IMPORTPUB_PLUGIN} ${EXE_NAME})
- ENDIF (LIBMSPUB_FOUND)
-ELSE (HAVE_REVENGE)
+ ENDIF ()
+ELSE ()
pkg_check_modules(LIBMSPUB libmspub-0.0<=0.1)
IF (LIBMSPUB_FOUND)
pkg_check_modules(LIBWPG libwpg-0.2)
@@ -32,8 +32,8 @@
TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPUB_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBMSPUB_LDFLAGS})
INSTALL(TARGETS ${SCRIBUS_IMPORTPUB_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
ADD_DEPENDENCIES(${SCRIBUS_IMPORTPUB_PLUGIN} ${EXE_NAME})
- ENDIF (LIBWPD_STREAM_FOUND)
- ENDIF (LIBWPD_FOUND)
- ENDIF (LIBWPG_FOUND)
- ENDIF (LIBMSPUB_FOUND)
-ENDIF (HAVE_REVENGE)
+ ENDIF ()
+ ENDIF ()
+ ENDIF ()
+ ENDIF ()
+ENDIF ()
Modified: trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -12,8 +12,8 @@
TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTVSD_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBVISIO_LDFLAGS})
INSTALL(TARGETS ${SCRIBUS_IMPORTVSD_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
ADD_DEPENDENCIES(${SCRIBUS_IMPORTVSD_PLUGIN} ${EXE_NAME})
- ENDIF (LIBVISIO_FOUND)
-ELSE (HAVE_REVENGE)
+ ENDIF ()
+ELSE ()
pkg_check_modules(LIBWPG libwpg-0.2)
IF (LIBWPG_FOUND)
pkg_check_modules(LIBWPD libwpd-0.9)
@@ -31,8 +31,8 @@
TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTVSD_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBVISIO_LDFLAGS})
INSTALL(TARGETS ${SCRIBUS_IMPORTVSD_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
ADD_DEPENDENCIES(${SCRIBUS_IMPORTVSD_PLUGIN} ${EXE_NAME})
- ENDIF (LIBVISIO_FOUND)
- ENDIF (LIBWPD_STREAM_FOUND)
- ENDIF (LIBWPD_FOUND)
- ENDIF (LIBWPG_FOUND)
-ENDIF (HAVE_REVENGE)
+ ENDIF ()
+ ENDIF ()
+ ENDIF ()
+ ENDIF ()
+ENDIF ()
Modified: trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -7,7 +7,7 @@
# Gentoo has an option for no examples. Let's make the ebuild simpler and open up the option to others, but leave as a default for us
IF (NOT WANT_NOEXAMPLES)
ADD_SUBDIRECTORY(samples)
-ENDIF (NOT WANT_NOEXAMPLES)
+ENDIF ()
ADD_SUBDIRECTORY(scripts)
SET(SCRIPTER_PLUGIN_UI_SRC
Modified: trunk/Scribus/scribus/plugins/tools/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/plugins/tools/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -1,7 +1,7 @@
#Subdirectories
IF(HAVE_BOOST)
ADD_SUBDIRECTORY(2geomtools)
-ENDIF(HAVE_BOOST)
+ENDIF()
ADD_SUBDIRECTORY(lenseffects)
ADD_SUBDIRECTORY(pathconnect)
ADD_SUBDIRECTORY(pathcut)
Modified: trunk/Scribus/scribus/relaxng/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/relaxng/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/relaxng/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/relaxng/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -9,7 +9,7 @@
# IF(QT4_WRAP_CPP)
QT4_WRAP_CPP(SCRIBUS_RELAXNG_MOC_SOURCES ${SCRIBUS_RELAXNG_HEADERS})
-# ENDIF(QT4_WRAP_CPP)
+# ENDIF()
Modified: trunk/Scribus/scribus/third_party/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21542&path=/trunk/Scribus/scribus/third_party/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/CMakeLists.txt Sun Nov 27 20:25:28 2016
@@ -1,10 +1,10 @@
IF(HAVE_OSG)
ADD_SUBDIRECTORY(prc)
-ENDIF (HAVE_OSG)
+ENDIF ()
IF(HAVE_BOOST)
ADD_SUBDIRECTORY(lib2geom)
-ENDIF(HAVE_BOOST)
+ENDIF()
ADD_SUBDIRECTORY(wpg)
ADD_SUBDIRECTORY(pgf)
More information about the scribus-commit
mailing list