Skip to content

Commit fd9b818

Browse files
committed
[NOP,BUILD] removed OpenBuildSystem prefix from cmake scripts
* fixed last change date generation in knime package generation * re-added targets target * added README to cmake folder, that documents it's purpose
1 parent 3b2d706 commit fd9b818

12 files changed

+162
-46
lines changed

CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ set(OPENMS_HOST_BINARY_DIRECTORY "${PROJECT_BINARY_DIR}")
148148
# CMake Utitlities
149149
#------------------------------------------------------------------------------
150150
# include some OpenMS specific macros
151-
include (${PROJECT_SOURCE_DIR}/cmake/OpenMSBuildSystem_macros.cmake)
151+
include (${PROJECT_SOURCE_DIR}/cmake/build_system_macros.cmake)
152152
# .. and some to ease the installation process
153153
include (${PROJECT_SOURCE_DIR}/cmake/install_macros.cmake)
154154
# .. and some to ease preparing the documentation builds
@@ -205,10 +205,9 @@ if (MSVC)
205205
SET(CMAKE_DEBUG_POSTFIX d)
206206
endif()
207207

208-
########################################################
209-
### setup path for external libs (contrib or system) ###
210-
########################################################
211-
include(${OPENMS_HOST_DIRECTORY}/cmake/OpenMSBuildSystem_setup_lib_find_paths.cmake)
208+
#------------------------------------------------------------------------------
209+
# setup path for external libs (contrib or system)
210+
include(${OPENMS_HOST_DIRECTORY}/cmake/setup_lib_find_paths.cmake)
212211

213212
#------------------------------------------------------------------------------
214213
# Initialize package building environment
@@ -238,7 +237,7 @@ set(SEARCH_ENGINES_DIRECTORY "" CACHE PATH "Directory containing the search engi
238237

239238
set(ENABLE_PREPARE_KNIME_PACKAGE OFF CACHE BOOL "If enabled, targets to prepare KNIME packages will be generated. Main target will be 'prepare_knime_package'.")
240239
if (ENABLE_PREPARE_KNIME_PACKAGE)
241-
include(${OPENMS_HOST_DIRECTORY}/cmake/OpenMSBuildSystem_ctdSupport.cmake)
240+
include(${OPENMS_HOST_DIRECTORY}/cmake/knime_package_support.cmake)
242241
endif()
243242

244243
#------------------------------------------------------------------------------
@@ -261,6 +260,7 @@ endif()
261260
#------------------------------------------------------------------------------
262261
# Some final messages for the users
263262
#------------------------------------------------------------------------------
263+
include(cmake/messages.cmake)
264264

265265
message(STATUS "")
266266
message(STATUS "-----------------------------------------------------------------")

cmake/OpenMSBuildSystem_messages.cmake

Whitespace-only changes.

cmake/OpenMSBuildSystem_testConfig.cmake

Lines changed: 0 additions & 26 deletions
This file was deleted.

cmake/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
OpenMS Build System Helpers
2+
======
3+
4+
This folder contains all scripts used by the OpenMS build system. Please add
5+
only build system relevant scripts. All external scripts should go into
6+
separate directories (e.g., `cmake/modules` for `Find*` scripts).

cmake/knime/configure_plugin_properties.cmake

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,15 @@ include ( ${SCRIPT_DIR}common.cmake )
4040
set(required_variables "SOURCE_PATH;TARGET_PATH;OPENMS_VERSION")
4141
check_variables(required_variables)
4242

43-
find_package(Subversion)
44-
if(Subversion_FOUND)
43+
find_package(Git)
44+
if(GIT_FOUND)
4545
file(TO_CMAKE_PATH "${SOURCE_PATH}" _OpenMS_CMAKE_PATH)
46-
Subversion_WC_INFO(${_OpenMS_CMAKE_PATH} OpenMS)
46+
execute_process(COMMAND ${GIT_EXECUTABLE} log -n 1 --simplify-by-decoration --pretty=%ai
47+
WORKING_DIRECTORY ${_OpenMS_CMAKE_PATH}
48+
ERROR_QUIET
49+
OUTPUT_VARIABLE OpenMS_WC_LAST_CHANGED_DATE
50+
OUTPUT_STRIP_TRAILING_WHITESPACE)
51+
4752
string(REGEX REPLACE "^([0-9]+)-([0-9]+)-([0-9]+) ([0-9]+):([0-9]+).*"
4853
"\\1\\2\\3\\4\\5" KNIME_DATE "${OpenMS_WC_LAST_CHANGED_DATE}")
4954
set(CF_OPENMS_VERSION "${OPENMS_VERSION}.${KNIME_DATE}")

cmake/messages.cmake

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
# --------------------------------------------------------------------------
2+
# OpenMS -- Open-Source Mass Spectrometry
3+
# --------------------------------------------------------------------------
4+
# Copyright The OpenMS Team -- Eberhard Karls University Tuebingen,
5+
# ETH Zurich, and Freie Universitaet Berlin 2002-2012.
6+
#
7+
# This software is released under a three-clause BSD license:
8+
# * Redistributions of source code must retain the above copyright
9+
# notice, this list of conditions and the following disclaimer.
10+
# * Redistributions in binary form must reproduce the above copyright
11+
# notice, this list of conditions and the following disclaimer in the
12+
# documentation and/or other materials provided with the distribution.
13+
# * Neither the name of any author or any participating institution
14+
# may be used to endorse or promote products derived from this software
15+
# without specific prior written permission.
16+
# For a full list of authors, refer to the file AUTHORS.
17+
# --------------------------------------------------------------------------
18+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19+
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21+
# ARE DISCLAIMED. IN NO EVENT SHALL ANY OF THE AUTHORS OR THE CONTRIBUTING
22+
# INSTITUTIONS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
23+
# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
24+
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
25+
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
26+
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
27+
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
28+
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
#
30+
# --------------------------------------------------------------------------
31+
# $Maintainer: Stephan Aiche $
32+
# $Authors: Stephan Aiche, Chris Bielow $
33+
# --------------------------------------------------------------------------
34+
35+
# --------------------------------------------------------------------------
36+
if (PYOPENMS)
37+
set(pyopenms_targets
38+
COMMAND ${CMAKE_COMMAND} -E echo " pyopenms builds pyOpenMS inplace"
39+
COMMAND ${CMAKE_COMMAND} -E echo " pyopenms_bdist_egg builds pyOpenMS bdist_egg"
40+
COMMAND ${CMAKE_COMMAND} -E echo " pyopenms_bdist builds pyOpenMS bdist as zip file"
41+
COMMAND ${CMAKE_COMMAND} -E echo " pyopenms_rpm builds pyOpenMS rpm"
42+
43+
)
44+
else()
45+
set(pyopenms_targets
46+
COMMAND ${CMAKE_COMMAND} -E echo ""
47+
COMMAND ${CMAKE_COMMAND} -E echo "The pyopenms targets are not enabled (to enable use -D PYOPENMS=ON)."
48+
)
49+
endif()
50+
51+
52+
# --------------------------------------------------------------------------
53+
# targets list
54+
if (MSVC)
55+
add_custom_target(targets
56+
COMMAND ${CMAKE_COMMAND} -E echo ""
57+
COMMAND ${CMAKE_COMMAND} -E echo "=========================================================================="
58+
COMMAND ${CMAKE_COMMAND} -E echo ""
59+
COMMAND ${CMAKE_COMMAND} -E echo "The following make targets are available:"
60+
COMMAND ${CMAKE_COMMAND} -E echo " ALL_BUILD [Visual Studio only] builds the OpenMS library, TOPP tools and UTILS tools"
61+
COMMAND ${CMAKE_COMMAND} -E echo " [no target] [NMake only] builds the OpenMS library, TOPP tools and UTILS tools"
62+
COMMAND ${CMAKE_COMMAND} -E echo " OpenMS builds the OpenMS library"
63+
COMMAND ${CMAKE_COMMAND} -E echo " TOPP builds the TOPP tools"
64+
COMMAND ${CMAKE_COMMAND} -E echo " UTILS builds the UTILS tools"
65+
COMMAND ${CMAKE_COMMAND} -E echo " GUI builds the GUI tools (TOPPView,...)"
66+
COMMAND ${CMAKE_COMMAND} -E echo " RUN_TESTS [Visual Studio only] executes OpenMS and TOPP tests (*)"
67+
COMMAND ${CMAKE_COMMAND} -E echo " test [NMake only] executes OpenMS and TOPP tests (*)"
68+
COMMAND ${CMAKE_COMMAND} -E echo " *) make sure they are built using the 'test_build' target (see below)"
69+
COMMAND ${CMAKE_COMMAND} -E echo " Tutorials_build builds the tutorials in source/EXAMPLES"
70+
COMMAND ${CMAKE_COMMAND} -E echo " doc builds the doxygen documentation and tutorials"
71+
COMMAND ${CMAKE_COMMAND} -E echo " doc_tutorials builds the pdf tutorials"
72+
${pyopenms_targets}
73+
COMMAND ${CMAKE_COMMAND} -E echo ""
74+
COMMAND ${CMAKE_COMMAND} -E echo "Single TOPP tools and UTILS have their own target, e.g. TOPPView"
75+
COMMAND ${CMAKE_COMMAND} -E echo "The class tests have their own project in ./source/TEST (project test_build)."
76+
COMMAND ${CMAKE_COMMAND} -E echo ""
77+
COMMAND ${CMAKE_COMMAND} -E echo "=========================================================================="
78+
COMMAND ${CMAKE_COMMAND} -E echo ""
79+
COMMENT "The most important targets for OpenMS"
80+
VERBATIM)
81+
else()
82+
add_custom_target(targets
83+
COMMAND ${CMAKE_COMMAND} -E echo ""
84+
COMMAND ${CMAKE_COMMAND} -E echo "=========================================================================="
85+
COMMAND ${CMAKE_COMMAND} -E echo ""
86+
COMMAND ${CMAKE_COMMAND} -E echo "The following make targets are available:"
87+
COMMAND ${CMAKE_COMMAND} -E echo " [no target] builds the OpenMS library, TOPP tools and UTILS tools"
88+
COMMAND ${CMAKE_COMMAND} -E echo " OpenMS builds the OpenMS library"
89+
COMMAND ${CMAKE_COMMAND} -E echo " TOPP builds the TOPP tools"
90+
COMMAND ${CMAKE_COMMAND} -E echo " UTILS builds the UTILS tools"
91+
COMMAND ${CMAKE_COMMAND} -E echo " GUI builds the GUI tools (TOPPView,...)"
92+
COMMAND ${CMAKE_COMMAND} -E echo " test executes OpenMS and TOPP tests"
93+
COMMAND ${CMAKE_COMMAND} -E echo " make sure they are built using the 'test_build' target"
94+
COMMAND ${CMAKE_COMMAND} -E echo " Tutorials_build builds the tutorials in source/EXAMPLES"
95+
COMMAND ${CMAKE_COMMAND} -E echo " doc builds the doxygen documentation and tutorials"
96+
COMMAND ${CMAKE_COMMAND} -E echo " doc_tutorials builds the pdf tutorials"
97+
COMMAND ${CMAKE_COMMAND} -E echo " help list all available targets (very long)"
98+
${pyopenms_targets}
99+
COMMAND ${CMAKE_COMMAND} -E echo ""
100+
COMMAND ${CMAKE_COMMAND} -E echo "Single TOPP tools and UTILS have their own target, e.g. TOPPView"
101+
COMMAND ${CMAKE_COMMAND} -E echo "The class tests have their own project in ./source/TEST."
102+
COMMAND ${CMAKE_COMMAND} -E echo ""
103+
COMMAND ${CMAKE_COMMAND} -E echo "=========================================================================="
104+
COMMAND ${CMAKE_COMMAND} -E echo ""
105+
COMMENT "The most important targets for OpenMS"
106+
VERBATIM)
107+
endif()
File renamed without changes.

src/openms/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@ message(STATUS "Info: CF_OPENMS_DOC_PATH: ${CF_OPENMS_DOC_PATH}")
6666
#------------------------------------------------------------------------------
6767
include(${PROJECT_SOURCE_DIR}/configh.cmake)
6868

69-
#------------------------------------------------------------------------------
70-
# Configures what is tested (DB-test, MS2-search engines)
71-
include(${OPENMS_HOST_DIRECTORY}/cmake/OpenMSBuildSystem_testConfig.cmake)
72-
7369
#------------------------------------------------------------------------------
7470
# big include file for headers and cpp files, that fills the OpenMS_sources variable
7571
include (${PROJECT_SOURCE_DIR}/includes.cmake)
@@ -138,8 +134,3 @@ install_directory(${OPENMS_HOST_DIRECTORY}/share/OpenMS/ ${INSTALL_SHARE_DIR} sh
138134
#------------------------------------------------------------------------------
139135
# register relevant paths for the doxygen doc generation
140136
openms_doc_path("${PROJECT_SOURCE_DIR}/include")
141-
142-
#------------------------------------------------------------------------------
143-
# verbose Post-build messages and help targets
144-
#------------------------------------------------------------------------------
145-
include(${OPENMS_HOST_DIRECTORY}/cmake/OpenMSBuildSystem_messages.cmake)

0 commit comments

Comments
 (0)