The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 0cd8c03d17b00cfd0ed9403205abbe2c112855ae Author: Vincent van Ravesteijn <[email protected]> Date: Mon Oct 22 18:12:29 2012 +0200 CMake: Put projects into subdirs This patch puts all projects into subfolders (at least for MSVS). In this way, there is a better overview (especially if the number of test projects will be increasing). diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ffa114..7d1992d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -294,6 +294,7 @@ endif() add_custom_target(lyx_version ALL COMMAND ${CMAKE_COMMAND} -DTOP_SRC_DIR=${TOP_SRC_DIR} -DTOP_CMAKE_PATH=${TOP_CMAKE_PATH} -DTOP_BINARY_DIR=${TOP_BINARY_DIR} -DLYX_DATE=${LYX_DATE} -P ${TOP_SCRIPT_PATH}/LyXGetVersion.cmake ) +set_target_properties(lyx_version PROPERTIES FOLDER "applications") if(APPLE) set(osx_bundle_program_name ${PACKAGE_BASE}${PROGRAM_SUFFIX}) diff --git a/boost/libs/regex/CMakeLists.txt b/boost/libs/regex/CMakeLists.txt index 817ec2e..2d09138 100644 --- a/boost/libs/regex/CMakeLists.txt +++ b/boost/libs/regex/CMakeLists.txt @@ -21,4 +21,5 @@ set(boost_regex_sources lyx_add_path(boost_regex_sources ${TOP_SRC_DIR}/boost/libs/regex/src) add_library(boost_regex STATIC ${boost_regex_sources}) +set_target_properties(boost_regex PROPERTIES FOLDER "3rd_party") diff --git a/boost/libs/signals/CMakeLists.txt b/boost/libs/signals/CMakeLists.txt index 6616401..65a29f1 100644 --- a/boost/libs/signals/CMakeLists.txt +++ b/boost/libs/signals/CMakeLists.txt @@ -23,3 +23,4 @@ else() add_library(boost_signals STATIC ${_allinone_files}) endif() +set_target_properties(boost_signals PROPERTIES FOLDER "3rd_party") diff --git a/development/cmake/modules/FindLyXGettext.cmake b/development/cmake/modules/FindLyXGettext.cmake index 80a9093..2105068 100755 --- a/development/cmake/modules/FindLyXGettext.cmake +++ b/development/cmake/modules/FindLyXGettext.cmake @@ -59,6 +59,7 @@ MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile) ENDFOREACH (_currentPoFile ) ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles}) + set_target_properties(translations PROPERTIES FOLDER "i18n") ENDMACRO(GETTEXT_CREATE_TRANSLATIONS ) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 9dd941e..d02c406 100755 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -51,6 +51,7 @@ macro(add_gettext_python _par _dir) COMMENT "${LYX_PYTHON_EXECUTABLE} ${TOP_SRC_DIR}/po/lyx_pot.py -b ${TOP_SRC_DIR} -o ${_dst} -t ${_par1} --src_file=${_src_files}" ) ADD_CUSTOM_TARGET(layouttranslations1 DEPENDS "${_dst}") + set_target_properties(layouttranslations1 PROPERTIES FOLDER "i18n") if (LYX_DATA_SUBDIR STREQUAL "") install(FILES "${TOP_SRC_DIR}/lib/layouttranslations" DESTINATION .) else() @@ -194,5 +195,6 @@ GETTEXT_CREATE_TRANSLATIONS(${CMAKE_CURRENT_BINARY_DIR}/${_lyxname}.pot ${_addAL # Create a new target to remerge po files # ALL omitted here, to prevent from automatic creation ADD_CUSTOM_TARGET(update-po DEPENDS ${LYX_UPDATED_PO_FILES}) +set_target_properties(update-po PROPERTIES FOLDER "i18n") add_dependencies(update-po translations) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4b86fdc..a922a7b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,6 +8,9 @@ project(${_lyx}) include_directories(${TOP_SRC_DIR}/src) +set_property(GLOBAL PROPERTY USE_FOLDERS ON) +set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets") + add_subdirectory(frontends) add_subdirectory(graphics) add_subdirectory(insets) @@ -118,6 +121,8 @@ add_executable(${_lyx} add_dependencies(${_lyx} lyx_version) +set_target_properties(${_lyx} PROPERTIES FOLDER "applications/LyX") + lyx_add_gcc_pch(${_lyx}) target_link_libraries(${_lyx} diff --git a/src/frontends/CMakeLists.txt b/src/frontends/CMakeLists.txt index 171e0a2..c8e8065 100644 --- a/src/frontends/CMakeLists.txt +++ b/src/frontends/CMakeLists.txt @@ -20,6 +20,7 @@ else() lyx_const_touched_files(_allinone frontends_sources) add_library(frontends ${library_type} ${_allinone_files}) endif() +set_target_properties(frontends PROPERTIES FOLDER "applications/LyX") target_link_libraries(frontends ${Lyx_Boost_Libraries}) diff --git a/src/frontends/qt4/CMakeLists.txt b/src/frontends/qt4/CMakeLists.txt index dfa969e..9a1dc5c 100644 --- a/src/frontends/qt4/CMakeLists.txt +++ b/src/frontends/qt4/CMakeLists.txt @@ -52,6 +52,7 @@ if(LYX_MERGE_FILES) else() add_library(frontend_qt4 ${library_type} ${frontends_qt4_sources} ${frontends_qt4_headers} ${ui_files} ${resource_files}) endif() +set_target_properties(frontend_qt4 PROPERTIES FOLDER "applications/LyX") target_link_libraries(frontend_qt4 diff --git a/src/graphics/CMakeLists.txt b/src/graphics/CMakeLists.txt index e2c0a9a..cd081ef 100644 --- a/src/graphics/CMakeLists.txt +++ b/src/graphics/CMakeLists.txt @@ -22,6 +22,7 @@ else() lyx_const_touched_files(_allinone graphics_sources) add_library(graphics ${library_type} ${_allinone_files}) endif() +set_target_properties(graphics PROPERTIES FOLDER "applications/LyX") lyx_add_gcc_pch(graphics) diff --git a/src/insets/CMakeLists.txt b/src/insets/CMakeLists.txt index a16ce3f..48a95cf 100644 --- a/src/insets/CMakeLists.txt +++ b/src/insets/CMakeLists.txt @@ -22,6 +22,7 @@ else() lyx_const_touched_files(_allinone insets_sources) add_library(insets ${library_type} ${_allinone_files}) endif() +set_target_properties(insets PROPERTIES FOLDER "applications/LyX") lyx_add_gcc_pch(insets) diff --git a/src/mathed/CMakeLists.txt b/src/mathed/CMakeLists.txt index 55dd303..8a3cf36 100644 --- a/src/mathed/CMakeLists.txt +++ b/src/mathed/CMakeLists.txt @@ -23,6 +23,7 @@ else() lyx_const_touched_files(_allinone mathed_sources) add_library(mathed ${library_type} ${_allinone_files}) endif() +set_target_properties(mathed PROPERTIES FOLDER "applications/LyX") lyx_add_gcc_pch(mathed) diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt index 5aa083d..3226201 100644 --- a/src/support/CMakeLists.txt +++ b/src/support/CMakeLists.txt @@ -74,6 +74,7 @@ else() add_library(support ${library_type} ${_allinone_files} ${support_separate} ${support_mythes_sources} ${support_linkback_sources} ${support_headers} ${dont_merge}) endif() +set_target_properties(support PROPERTIES FOLDER "applications/LyX") target_link_libraries(support ${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARY}) diff --git a/src/support/tests/CMakeLists.txt b/src/support/tests/CMakeLists.txt index 4f6f3a1..1ff0ce6 100644 --- a/src/support/tests/CMakeLists.txt +++ b/src/support/tests/CMakeLists.txt @@ -43,6 +43,8 @@ foreach(_src ${check_PROGRAMS}) -DInput=${src_data_file} -DOutput=${created_data_file} -P "${TOP_SRC_DIR}/src/support/tests/supporttest.cmake") + + set_target_properties(${_src} PROPERTIES FOLDER "tests/support") endforeach() diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt index bfe3d54..ee36c5f 100644 --- a/src/tex2lyx/CMakeLists.txt +++ b/src/tex2lyx/CMakeLists.txt @@ -43,6 +43,7 @@ else() lyx_const_touched_files(_allinone_linked LINKED_sources) add_executable(${_tex2lyx} ${_allinone_files} ${_allinone_linked_files} ${FILE_RC}) endif() +set_target_properties(${_tex2lyx} PROPERTIES FOLDER "applications/TeX2LyX") target_link_libraries(${_tex2lyx} support ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 1 + boost/libs/regex/CMakeLists.txt | 1 + boost/libs/signals/CMakeLists.txt | 1 + development/cmake/modules/FindLyXGettext.cmake | 1 + po/CMakeLists.txt | 2 ++ src/CMakeLists.txt | 5 +++++ src/frontends/CMakeLists.txt | 1 + src/frontends/qt4/CMakeLists.txt | 1 + src/graphics/CMakeLists.txt | 1 + src/insets/CMakeLists.txt | 1 + src/mathed/CMakeLists.txt | 1 + src/support/CMakeLists.txt | 1 + src/support/tests/CMakeLists.txt | 2 ++ src/tex2lyx/CMakeLists.txt | 1 + 14 files changed, 20 insertions(+), 0 deletions(-) hooks/post-receive -- The LyX Source Repository
