diff options
| -rw-r--r-- | cmake/Modules/GrBoost.cmake | 8 | ||||
| -rw-r--r-- | cmake/Modules/GrComponent.cmake | 8 | ||||
| -rw-r--r-- | cmake/Modules/GrMiscUtils.cmake | 8 | ||||
| -rw-r--r-- | cmake/Modules/GrPackage.cmake | 8 | ||||
| -rw-r--r-- | cmake/Modules/GrPlatform.cmake | 8 | ||||
| -rw-r--r-- | cmake/Modules/GrPython.cmake | 8 | ||||
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 8 | ||||
| -rw-r--r-- | cmake/Modules/GrTest.cmake | 8 | ||||
| -rw-r--r-- | cmake/Modules/GrVersion.cmake | 8 |
9 files changed, 36 insertions, 36 deletions
diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake index e045b58e2..5e3ad1b43 100644 --- a/cmake/Modules/GrBoost.cmake +++ b/cmake/Modules/GrBoost.cmake @@ -17,8 +17,10 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -IF(NOT DEFINED INCLUDED_GR_BOOST_CMAKE) -SET(INCLUDED_GR_BOOST_CMAKE TRUE) +IF(DEFINED __INCLUDED_GR_BOOST_CMAKE) + RETURN() +ENDIF() +SET(__INCLUDED_GR_BOOST_CMAKE TRUE) ######################################################################## # Setup Boost and handle some system specific things @@ -50,5 +52,3 @@ ENDIF(MSVC) SET(Boost_ADDITIONAL_VERSIONS "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44" "1.45.0" "1.45" "1.46.0" "1.46" "1.47.0" "1.47") FIND_PACKAGE(Boost "1.35" COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) - -ENDIF(NOT DEFINED INCLUDED_GR_BOOST_CMAKE) diff --git a/cmake/Modules/GrComponent.cmake b/cmake/Modules/GrComponent.cmake index 0b4326a72..8a94e219a 100644 --- a/cmake/Modules/GrComponent.cmake +++ b/cmake/Modules/GrComponent.cmake @@ -17,8 +17,10 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -IF(NOT DEFINED INCLUDED_GR_COMPONENT_CMAKE) -SET(INCLUDED_GR_COMPONENT_CMAKE TRUE) +IF(DEFINED __INCLUDED_GR_COMPONENT_CMAKE) + RETURN() +ENDIF() +SET(__INCLUDED_GR_COMPONENT_CMAKE TRUE) SET(_gr_enabled_components "" CACHE INTERNAL "" FORCE) SET(_gr_disabled_components "" CACHE INTERNAL "" FORCE) @@ -78,5 +80,3 @@ FUNCTION(GR_PRINT_COMPONENT_SUMMARY) MESSAGE(STATUS "") ENDFUNCTION(GR_PRINT_COMPONENT_SUMMARY) - -ENDIF(NOT DEFINED INCLUDED_GR_COMPONENT_CMAKE) diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake index d60217ca3..a7e20124f 100644 --- a/cmake/Modules/GrMiscUtils.cmake +++ b/cmake/Modules/GrMiscUtils.cmake @@ -17,8 +17,10 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -IF(NOT DEFINED INCLUDED_GR_MISC_UTILS_CMAKE) -SET(INCLUDED_GR_MISC_UTILS_CMAKE TRUE) +IF(DEFINED __INCLUDED_GR_MISC_UTILS_CMAKE) + RETURN() +ENDIF() +SET(__INCLUDED_GR_MISC_UTILS_CMAKE TRUE) ######################################################################## # Set global variable macro. @@ -96,5 +98,3 @@ print re.sub('\\W', '_', '${desc} ${reldir} ' + unique)" OUTPUT_VARIABLE _target OUTPUT_STRIP_TRAILING_WHITESPACE) ADD_CUSTOM_TARGET(${_target} ALL DEPENDS ${ARGN}) ENDFUNCTION(GR_UNIQUE_TARGET) - -ENDIF(NOT DEFINED INCLUDED_GR_MISC_UTILS_CMAKE) diff --git a/cmake/Modules/GrPackage.cmake b/cmake/Modules/GrPackage.cmake index 1d03dff39..7647324a0 100644 --- a/cmake/Modules/GrPackage.cmake +++ b/cmake/Modules/GrPackage.cmake @@ -17,8 +17,10 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -IF(NOT DEFINED INCLUDED_GR_PACKAGE_CMAKE) -SET(INCLUDED_GR_PACKAGE_CMAKE TRUE) +IF(DEFINED __INCLUDED_GR_PACKAGE_CMAKE) + RETURN() +ENDIF() +SET(__INCLUDED_GR_PACKAGE_CMAKE TRUE) INCLUDE(GrVersion) #sets version information INCLUDE(GrPlatform) #sets platform information @@ -128,5 +130,3 @@ SET(CPACK_RPM_PACKAGE_REQUIRES "boost-devel") #TODO other packages SET(CPACK_NSIS_MODIFY_PATH ON) SET(HLKM_ENV "\\\"SYSTEM\\\\CurrentControlSet\\\\Control\\\\Session Manager\\\\Environment\\\"") - -ENDIF(NOT DEFINED INCLUDED_GR_PACKAGE_CMAKE) diff --git a/cmake/Modules/GrPlatform.cmake b/cmake/Modules/GrPlatform.cmake index 0f4efe623..85f318618 100644 --- a/cmake/Modules/GrPlatform.cmake +++ b/cmake/Modules/GrPlatform.cmake @@ -17,8 +17,10 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -IF(NOT DEFINED INCLUDED_GR_PLATFORM_CMAKE) -SET(INCLUDED_GR_PLATFORM_CMAKE TRUE) +IF(DEFINED __INCLUDED_GR_PLATFORM_CMAKE) + RETURN() +ENDIF() +SET(__INCLUDED_GR_PLATFORM_CMAKE TRUE) ######################################################################## # Setup additional defines for OS types @@ -42,5 +44,3 @@ IF(NOT DEFINED LIB_SUFFIX AND REDHAT AND CMAKE_SYSTEM_PROCESSOR MATCHES "64$") SET(LIB_SUFFIX 64) ENDIF() SET(LIB_SUFFIX ${LIB_SUFFIX} CACHE STRING "lib directory suffix") - -ENDIF(NOT DEFINED INCLUDED_GR_PLATFORM_CMAKE) diff --git a/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake index 2f5f67916..676a98c41 100644 --- a/cmake/Modules/GrPython.cmake +++ b/cmake/Modules/GrPython.cmake @@ -17,8 +17,10 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -IF(NOT DEFINED INCLUDED_GR_PYTHON_CMAKE) -SET(INCLUDED_GR_PYTHON_CMAKE TRUE) +IF(DEFINED __INCLUDED_GR_PYTHON_CMAKE) + RETURN() +ENDIF() +SET(__INCLUDED_GR_PYTHON_CMAKE TRUE) ######################################################################## # Setup the python interpreter: @@ -165,5 +167,3 @@ FUNCTION(GR_PYTHON_INSTALL) GR_UNIQUE_TARGET("pygen" ${python_install_gen_targets}) ENDFUNCTION(GR_PYTHON_INSTALL) - -ENDIF(NOT DEFINED INCLUDED_GR_PYTHON_CMAKE) diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index f32bf10cc..9fca29a4f 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -17,8 +17,10 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -IF(NOT DEFINED INCLUDED_GR_SWIG_CMAKE) -SET(INCLUDED_GR_SWIG_CMAKE TRUE) +IF(DEFINED __INCLUDED_GR_SWIG_CMAKE) + RETURN() +ENDIF() +SET(__INCLUDED_GR_SWIG_CMAKE TRUE) ######################################################################## # Build a swig target for the common gnuradio use case. Usage: @@ -86,5 +88,3 @@ MACRO(GR_SWIG_INSTALL) ENDFOREACH(name) ENDMACRO(GR_SWIG_INSTALL) - -ENDIF(NOT DEFINED INCLUDED_GR_SWIG_CMAKE) diff --git a/cmake/Modules/GrTest.cmake b/cmake/Modules/GrTest.cmake index 308579008..1851437af 100644 --- a/cmake/Modules/GrTest.cmake +++ b/cmake/Modules/GrTest.cmake @@ -17,8 +17,10 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -IF(NOT DEFINED INCLUDED_GR_TEST_CMAKE) -SET(INCLUDED_GR_TEST_CMAKE TRUE) +IF(DEFINED __INCLUDED_GR_TEST_CMAKE) + RETURN() +ENDIF() +SET(__INCLUDED_GR_TEST_CMAKE TRUE) ######################################################################## # Add a unit test and setup the environment for a unit test. @@ -126,5 +128,3 @@ FUNCTION(GR_ADD_TEST test_name) ENDIF(WIN32) ENDFUNCTION(GR_ADD_TEST) - -ENDIF(NOT DEFINED INCLUDED_GR_TEST_CMAKE) diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake index 556495336..05a4250f4 100644 --- a/cmake/Modules/GrVersion.cmake +++ b/cmake/Modules/GrVersion.cmake @@ -17,8 +17,10 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -IF(NOT DEFINED INCLUDED_GR_VERSION_CMAKE) -SET(INCLUDED_GR_VERSION_CMAKE TRUE) +IF(DEFINED __INCLUDED_GR_VERSION_CMAKE) + RETURN() +ENDIF() +SET(__INCLUDED_GR_VERSION_CMAKE TRUE) ######################################################################## # Setup version variables. @@ -56,5 +58,3 @@ IF(NOT LIBVER) ENDIF() MESSAGE(STATUS "VERSION: ${VERSION}, LIBVER: ${LIBVER}") - -ENDIF(NOT DEFINED INCLUDED_GR_VERSION_CMAKE) |