Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[10805] trunk
|
From: <ai...@us...> - 2010-02-18 21:38:59
|
Revision: 10805
http://plplot.svn.sourceforge.net/plplot/?rev=10805&view=rev
Author: airwin
Date: 2010-02-18 21:38:39 +0000 (Thu, 18 Feb 2010)
Log Message:
-----------
Reorganize language support using the CMAKE_MODULES_PATH list to have
different language support depending on whether the cmake version is
2.6.x or 2.8.x.
The new locations for all language support files are
cmake/modules/language_support/cmake
cmake/modules/language_support/cmake/Platform
cmake/modules/language_support/cmake-2.6
cmake/modules/language_support/cmake-2.6/Platform
cmake/modules/language_support/cmake-2.8
cmake/modules/language_support/cmake-2.8/Platform
The cmake subdirectory is used for all language support infrastructure files
(currently Ada and D) that are independent of whether the version of CMake
is 2.6.x or 2.8.x. The cmake-2.6 subdirectory is used for all language
support infrastructure files (currently Fortran for CMake-2.6.x) that depend
on CMake-2.6.x. The cmake-2.8 subdirectory (currently empty) is to be used
for all language support infrastructure files (Fortran for CMake-2.8.x as
soon as Arjen's work is done for that) that depend on CMake-2.8.x.
Currently tested just for Linux with gfortran, the standard Linux Ada and D
compilers, and CMake-2.8.1-RC3. So obviously more testing is needed for
Linux and CMake-2.6.4 and especially on the Windows platforms (both for
CMake-2.6.4 and CMake-2.8.1-RC3) with all their special language support
requirements.
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/cmake/modules/language_support.cmake
trunk/examples/CMakeLists.txt
Added Paths:
-----------
trunk/cmake/modules/language_support/
trunk/cmake/modules/language_support/cmake/
trunk/cmake/modules/language_support/cmake/CMakeAdaCompiler.cmake.in
trunk/cmake/modules/language_support/cmake/CMakeAdaInformation.cmake
trunk/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in
trunk/cmake/modules/language_support/cmake/CMakeDInformation.cmake
trunk/cmake/modules/language_support/cmake/CMakeD_Copyright.txt
trunk/cmake/modules/language_support/cmake/CMakeDetermineAdaCompiler.cmake
trunk/cmake/modules/language_support/cmake/CMakeDetermineDCompiler.cmake
trunk/cmake/modules/language_support/cmake/CMakeTestAdaCompiler.cmake
trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
trunk/cmake/modules/language_support/cmake/Platform/
trunk/cmake/modules/language_support/cmake-2.6/
trunk/cmake/modules/language_support/cmake-2.6/CMakeFortranInformation.cmake
trunk/cmake/modules/language_support/cmake-2.6/Platform/
trunk/cmake/modules/language_support/cmake-2.6/Platform/Cygwin-GNU-Fortran.cmake
trunk/cmake/modules/language_support/cmake-2.6/Platform/Windows-GNU-Fortran.cmake
trunk/cmake/modules/language_support/cmake-2.6/Platform/Windows-df.cmake
trunk/cmake/modules/language_support/cmake-2.6/Platform/Windows-f90.cmake
trunk/cmake/modules/language_support/cmake-2.8/
trunk/cmake/modules/language_support/cmake-2.8/Platform/
Removed Paths:
-------------
trunk/cmake/modules/CMakeAdaCompiler.cmake.in
trunk/cmake/modules/CMakeAdaInformation.cmake
trunk/cmake/modules/CMakeDCompiler.cmake.in
trunk/cmake/modules/CMakeDInformation.cmake
trunk/cmake/modules/CMakeD_Copyright.txt
trunk/cmake/modules/CMakeDetermineAdaCompiler.cmake
trunk/cmake/modules/CMakeDetermineDCompiler.cmake
trunk/cmake/modules/CMakeFortranInformation.cmake
trunk/cmake/modules/CMakeTestAdaCompiler.cmake
trunk/cmake/modules/CMakeTestDCompiler.cmake
trunk/cmake/modules/Platform/
trunk/cmake/modules/language_support/cmake/Platform/Cygwin-GNU-Fortran.cmake
trunk/cmake/modules/language_support/cmake/Platform/Windows-GNU-Fortran.cmake
trunk/cmake/modules/language_support/cmake/Platform/Windows-df.cmake
trunk/cmake/modules/language_support/cmake/Platform/Windows-f90.cmake
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2010-02-17 21:41:03 UTC (rev 10804)
+++ trunk/CMakeLists.txt 2010-02-18 21:38:39 UTC (rev 10805)
@@ -55,8 +55,20 @@
set(PACKAGE plplot)
-# Location where PLplot cmake build system first looks for cmake modules.
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
+# Locations where PLplot cmake build system first looks for cmake modules.
+if(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
+ set(CMAKE_MODULE_PATH
+ ${PROJECT_SOURCE_DIR}/cmake/modules
+ ${PROJECT_SOURCE_DIR}/cmake/modules/language_support/cmake
+ ${PROJECT_SOURCE_DIR}/cmake/modules/language_support/cmake-2.6
+ )
+else(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
+ set(CMAKE_MODULE_PATH
+ ${PROJECT_SOURCE_DIR}/cmake/modules
+ ${PROJECT_SOURCE_DIR}/cmake/modules/language_support/cmake
+ ${PROJECT_SOURCE_DIR}/cmake/modules/language_support/cmake-2.8
+ )
+endif(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
# We need the path to the MinGW/Borland compiler in order to find
# the import libraries for system libraries.
Deleted: trunk/cmake/modules/CMakeAdaCompiler.cmake.in
===================================================================
--- trunk/cmake/modules/CMakeAdaCompiler.cmake.in 2010-02-17 21:41:03 UTC (rev 10804)
+++ trunk/cmake/modules/CMakeAdaCompiler.cmake.in 2010-02-18 21:38:39 UTC (rev 10805)
@@ -1,17 +0,0 @@
-SET(CMAKE_Ada_COMPILER "@CMAKE_Ada_COMPILER@")
-SET(CMAKE_Ada_COMPILER_ARG1 "@CMAKE_Ada_COMPILER_ARG1@")
-SET(CMAKE_AR "@CMAKE_AR@")
-SET(CMAKE_RANLIB "@CMAKE_RANLIB@")
-SET(CMAKE_Ada_COMPILER_LOADED 1)
-
-SET(CMAKE_Ada_COMPILER_ENV_VAR "ADA")
-
-SET(CMAKE_Ada_SOURCE_FILE_EXTENSIONS adb)
-SET(CMAKE_Ada_IGNORE_EXTENSIONS ads;h;H;o;O;obj;OBJ;def;DEF;rc;RC)
-SET(CMAKE_Ada_LINKER_PREFERENCE Prefered)
-IF(UNIX OR MINGW)
- SET(CMAKE_Ada_OUTPUT_EXTENSION .o)
-ELSE(UNIX OR MINGW)
- SET(CMAKE_Ada_OUTPUT_EXTENSION .obj)
-ENDIF(UNIX OR MINGW)
-SET(CMAKE_Ada_OUTPUT_EXTENSION_REPLACE 1)
Deleted: trunk/cmake/modules/CMakeAdaInformation.cmake
===================================================================
--- trunk/cmake/modules/CMakeAdaInformation.cmake 2010-02-17 21:41:03 UTC (rev 10804)
+++ trunk/cmake/modules/CMakeAdaInformation.cmake 2010-02-18 21:38:39 UTC (rev 10805)
@@ -1,244 +0,0 @@
-# This file sets the basic flags for the Ada language in CMake.
-# It also loads the available platform file for the system-compiler
-# if it exists.
-
-GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_Ada_COMPILER} NAME_WE)
-SET(CMAKE_SYSTEM_AND_Ada_COMPILER_INFO_FILE
- ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
-INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
-
-# This should be included before the _INIT variables are
-# used to initialize the cache. Since the rule variables
-# have if blocks on them, users can still define them here.
-# But, it should still be after the platform file so changes can
-# be made to those values.
-
-IF(CMAKE_USER_MAKE_RULES_OVERRIDE)
- INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE})
-ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE)
-
-IF(CMAKE_USER_MAKE_RULES_OVERRIDE_Ada)
- INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE_Ada})
-ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE_Ada)
-
-# Create a set of shared library variable specific to Ada
-# For 90% of the systems, these are the same flags as the C versions
-# so if these are not set just copy the flags from the c version
-
-IF(NOT CMAKE_SHARED_LIBRARY_CREATE_Ada_FLAGS)
- SET(CMAKE_SHARED_LIBRARY_CREATE_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_CREATE_Ada_FLAGS)
-
-IF(NOT CMAKE_SHARED_LIBRARY_Ada_FLAGS)
- SET(CMAKE_SHARED_LIBRARY_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_Ada_FLAGS)
-
-IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS)
- SET(CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS})
-ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_FLAGS)
-
-IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG)
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG)
-
-IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP)
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP)
-
-IF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG)
- SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG)
-
-# repeat for modules
-IF(NOT CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS)
- SET(CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS})
-ENDIF(NOT CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS)
-
-IF(NOT CMAKE_SHARED_MODULE_Ada_FLAGS)
- SET(CMAKE_SHARED_MODULE_Ada_FLAGS ${CMAKE_SHARED_MODULE_C_FLAGS})
-ENDIF(NOT CMAKE_SHARED_MODULE_Ada_FLAGS)
-
-IF(NOT CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG)
- SET(CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG})
-ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG)
-
-IF(NOT CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP)
- SET(CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP})
-ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Ada_FLAG_SEP)
-
-IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG)
- SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG})
-ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG)
-
-IF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP)
- SET(CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_Ada_FLAG_SEP})
-ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Ada_FLAG_SEP)
-
-IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG)
- SET(CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_Ada_FLAG})
-ENDIF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Ada_FLAG)
-
-IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH)
- SET(CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH ${CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH})
-ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Ada_WITH_RUNTIME_PATH)
-
-IF(NOT CMAKE_INCLUDE_FLAG_Ada)
- SET(CMAKE_INCLUDE_FLAG_Ada ${CMAKE_INCLUDE_FLAG_C})
-ENDIF(NOT CMAKE_INCLUDE_FLAG_Ada)
-
-IF(NOT CMAKE_INCLUDE_FLAG_SEP_Ada)
- SET(CMAKE_INCLUDE_FLAG_SEP_Ada ${CMAKE_INCLUDE_FLAG_SEP_C})
-ENDIF(NOT CMAKE_INCLUDE_FLAG_SEP_Ada)
-
-# Copy C version of this flag which is normally determined in platform file.
-IF(NOT CMAKE_SHARED_LIBRARY_SONAME_Ada_FLAG)
- SET(CMAKE_SHARED_LIBRARY_SONAME_Ada_FLAG ${CMAKE_SHARED_LIBRARY_SONAME_C_FLAG})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_SONAME_Ada_FLAG)
-
-SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.")
-
-SET(CMAKE_Ada_FLAGS_INIT "$ENV{FFLAGS} ${CMAKE_Ada_FLAGS_INIT}")
-# avoid just having a space as the initial value for the cache
-IF(CMAKE_Ada_FLAGS_INIT STREQUAL " ")
- SET(CMAKE_Ada_FLAGS_INIT)
-ENDIF(CMAKE_Ada_FLAGS_INIT STREQUAL " ")
-SET (CMAKE_Ada_FLAGS "${CMAKE_Ada_FLAGS_INIT}" CACHE STRING
- "Flags for Ada compiler.")
-
-INCLUDE(CMakeCommonLanguageInclude)
-
-# now define the following rule variables
-
-# CMAKE_Ada_CREATE_SHARED_LIBRARY
-# CMAKE_Ada_CREATE_SHARED_MODULE
-# CMAKE_Ada_CREATE_STATIC_LIBRARY
-# CMAKE_Ada_COMPILE_OBJECT
-# CMAKE_Ada_LINK_EXECUTABLE
-
-# variables supplied by the generator at use time
-# <TARGET>
-# <TARGET_BASE> the target without the suffix
-# <OBJECTS>
-# <OBJECT>
-# <LINK_LIBRARIES>
-# <FLAGS>
-# <LINK_FLAGS>
-
-# Ada compiler information
-# <CMAKE_Ada_COMPILER>
-# <CMAKE_SHARED_LIBRARY_CREATE_Ada_FLAGS>
-# <CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS>
-# <CMAKE_Ada_LINK_FLAGS>
-
-# Static library tools
-# <CMAKE_AR>
-# <CMAKE_RANLIB>
-
-
-# create an Ada shared library
-IF(NOT CMAKE_Ada_CREATE_SHARED_LIBRARY)
- IF(APPLE)
- # Temporary fixup for one user's Ada/Mac OS X problems when using the
- # the 4.2 version of the http://macada.org/ version of the GNAT compiler.
- SET(CMAKE_Ada_CREATE_SHARED_LIBRARY
- "<CMAKE_Ada_COMPILER> <CMAKE_SHARED_LIBRARY_Ada_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Ada_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_Ada_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES> -lgcc_s.1"
- )
- ELSE(APPLE)
- SET(CMAKE_Ada_CREATE_SHARED_LIBRARY
- "<CMAKE_Ada_COMPILER> <CMAKE_SHARED_LIBRARY_Ada_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Ada_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_Ada_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>"
- )
- ENDIF(APPLE)
-ENDIF(NOT CMAKE_Ada_CREATE_SHARED_LIBRARY)
-
-# create an Ada shared module just copy the shared library rule
-IF(NOT CMAKE_Ada_CREATE_SHARED_MODULE)
- SET(CMAKE_Ada_CREATE_SHARED_MODULE ${CMAKE_Ada_CREATE_SHARED_LIBRARY})
-ENDIF(NOT CMAKE_Ada_CREATE_SHARED_MODULE)
-
-# create an Ada static library
-IF(NOT CMAKE_Ada_CREATE_STATIC_LIBRARY)
- SET(CMAKE_Ada_CREATE_STATIC_LIBRARY
- "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS> "
- "<CMAKE_RANLIB> <TARGET> ")
-ENDIF(NOT CMAKE_Ada_CREATE_STATIC_LIBRARY)
-
-# compile a Ada file into an object file
-IF(NOT CMAKE_Ada_COMPILE_OBJECT)
- SET(CMAKE_Ada_COMPILE_OBJECT
- "<CMAKE_Ada_COMPILER> <FLAGS> -c <SOURCE> -o <OBJECT>
- ")
-ENDIF(NOT CMAKE_Ada_COMPILE_OBJECT)
-
-# Constraints: GNAT_EXECUTABLE_BUILDER = gnatmake
-# is required to do the compile+bind+link of
-# Ada executables, and it requires a source file name which is constructed from
-# <TARGET>.adb. The source file arguments of add_executable are
-# all compiled by the above rule (which must remain that form since it
-# is also used to compile objects for Ada libraries), but the results are
-# ignored since they are put in a different directory while gnatmake assumes
-# objects are located in the _current_ directory. Thus, put in a minimal
-# source file (with correct .adb suffix to identify the Ada language)
-# to reduce this useless compilation to a minimum. Usually, the main Ada
-# routine qualifies since it is normally small. Thus, the normal usage is
-# add_executable(foo foo.adb), but add_executable(foo path/minimal.adb) would
-# work as well so long as both path/minimal.adb existed and foo.adb existed.
-# Also, note there is no way to specify
-# ${CMAKE_CURRENT_SOURCE_DIR}/<TARGET>.adb as the code for gnatmake to compile
-# because in this context ${CMAKE_CURRENT_SOURCE_DIR} is set to the top
-# of the source tree and not the expected sub-directory of the source tree.
-# Thus, LINK_FLAGS -aI${CMAKE_CURRENT_SOURCE_DIR} must be set using
-# set_target_properties in order to specify the directory where <TARGET>.adb
-# exists. Note, LINK_FLAGS can also be used to set other gnatmake flags
-# such as -aL.
-
-# In sum, you have to be careful of your target name, the nominal source file
-# name has to be compilable, but otherwise it is ignored, and you must specify
-# the required -aI and other GNAT_EXECUTABLE_BUILDER = gnatmake options
-# using LINK_FLAGS specified with set_target_properties.
-# However, so long as you pay attention to these
-# constraints, add_executable should work for the Ada language.
-
-IF(NOT CMAKE_Ada_LINK_EXECUTABLE)
- # N.B. under some circumstances (build tests) GNAT_EXECUTABLE_BUILDER is not
- # defined at this stage for unknown reasons so try to find it again as a
- # last resort.
- GET_FILENAME_COMPONENT(COMPILER_LOCATION "${CMAKE_Ada_COMPILER}"
- PATH)
- FIND_PROGRAM(GNAT_EXECUTABLE_BUILDER NAMES gnatmake PATHS ${COMPILER_LOCATION} )
-
- IF(APPLE)
- # Temporary fixup for one user's Ada/Mac OS X problems when using the
- # the 4.2 version of the http://macada.org/ version of the GNAT compiler.
- SET(CMAKE_Ada_LINK_EXECUTABLE
- "${GNAT_EXECUTABLE_BUILDER} <CMAKE_Ada_LINK_FLAGS> <LINK_FLAGS> <TARGET_BASE>.adb -cargs <FLAGS> -largs <LINK_LIBRARIES> -lgcc_s.1")
- ELSE(APPLE)
- SET(CMAKE_Ada_LINK_EXECUTABLE
- "${GNAT_EXECUTABLE_BUILDER} <CMAKE_Ada_LINK_FLAGS> <LINK_FLAGS> <TARGET_BASE>.adb -cargs <FLAGS> -largs <LINK_LIBRARIES>")
- ENDIF(APPLE)
-ENDIF(NOT CMAKE_Ada_LINK_EXECUTABLE)
-
-IF(CMAKE_Ada_STANDARD_LIBRARIES_INIT)
- SET(CMAKE_Ada_STANDARD_LIBRARIES "${CMAKE_Ada_STANDARD_LIBRARIES_INIT}"
- CACHE STRING "Libraries linked by default with all Ada applications.")
- MARK_AS_ADVANCED(CMAKE_Ada_STANDARD_LIBRARIES)
-ENDIF(CMAKE_Ada_STANDARD_LIBRARIES_INIT)
-
-IF(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
- SET (CMAKE_Ada_FLAGS_DEBUG "${CMAKE_Ada_FLAGS_DEBUG_INIT}" CACHE STRING
- "Flags used by the compiler during debug builds.")
- SET (CMAKE_Ada_FLAGS_MINSIZEREL "${CMAKE_Ada_FLAGS_MINSIZEREL_INIT}" CACHE STRING
- "Flags used by the compiler during release minsize builds.")
- SET (CMAKE_Ada_FLAGS_RELEASE "${CMAKE_Ada_FLAGS_RELEASE_INIT}" CACHE STRING
- "Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files).")
- SET (CMAKE_Ada_FLAGS_RELWITHDEBINFO "${CMAKE_Ada_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
- "Flags used by the compiler during Release with Debug Info builds.")
-ENDIF(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
-
-MARK_AS_ADVANCED(
-CMAKE_Ada_FLAGS
-CMAKE_Ada_FLAGS_DEBUG
-CMAKE_Ada_FLAGS_MINSIZEREL
-CMAKE_Ada_FLAGS_RELEASE
-CMAKE_Ada_FLAGS_RELWITHDEBINFO
-)
-SET(CMAKE_Ada_INFORMATION_LOADED 1)
Deleted: trunk/cmake/modules/CMakeDCompiler.cmake.in
===================================================================
--- trunk/cmake/modules/CMakeDCompiler.cmake.in 2010-02-17 21:41:03 UTC (rev 10804)
+++ trunk/cmake/modules/CMakeDCompiler.cmake.in 2010-02-18 21:38:39 UTC (rev 10805)
@@ -1,46 +0,0 @@
-#
-# CMakeD - CMake module for D Language
-#
-# Copyright (c) 2007, Selman Ulug <sel...@gm...>
-# Tim Burrell <tim...@gm...>
-#
-# All rights reserved.
-#
-# See Copyright.txt for details.
-#
-# Modified from CMake 2.6.5 CMakeCCompiler.cmake.in
-# See http://www.cmake.org/HTML/Copyright.html for details
-#
-
-SET(CMAKE_D_COMPILER "@CMAKE_D_COMPILER@")
-SET(CMAKE_D_COMPILER_ARG1 "@CMAKE_D_COMPILER_ARG1@")
-SET(CMAKE_AR "@CMAKE_AR@")
-SET(CMAKE_RANLIB "@CMAKE_RANLIB@")
-SET(CMAKE_COMPILER_IS_GDC @CMAKE_COMPILER_IS_GDC@)
-SET(CMAKE_COMPILER_IS_DMD @CMAKE_COMPILER_IS_DMD@)
-SET(CMAKE_D_COMPILER_LOADED 1)
-SET(CMAKE_COMPILER_IS_MINGW @CMAKE_COMPILER_IS_MINGW@)
-SET(CMAKE_COMPILER_IS_CYGWIN @CMAKE_COMPILER_IS_CYGWIN@)
-IF(CMAKE_COMPILER_IS_CYGWIN)
- SET(CYGWIN 1)
- SET(UNIX 1)
-ENDIF(CMAKE_COMPILER_IS_CYGWIN)
-
-SET(CMAKE_D_COMPILER_ENV_VAR "DC")
-
-IF(CMAKE_COMPILER_IS_MINGW)
- SET(MINGW 1)
-ENDIF(CMAKE_COMPILER_IS_MINGW)
-SET(CMAKE_COMPILER_IS_GDC_RUN 1)
-SET(CMAKE_D_SOURCE_FILE_EXTENSIONS d)
-SET(CMAKE_D_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC)
-SET(CMAKE_D_LINKER_PREFERENCE None)
-IF(UNIX)
- SET(CMAKE_D_OUTPUT_EXTENSION .o)
-ELSE(UNIX)
- SET(CMAKE_D_OUTPUT_EXTENSION .obj)
-ENDIF(UNIX)
-SET(CMAKE_D_OUTPUT_EXTENSION_REPLACE 1)
-# save the size of void* in case where cache is removed
-# and the this file is still around
-#SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@)
Deleted: trunk/cmake/modules/CMakeDInformation.cmake
===================================================================
--- trunk/cmake/modules/CMakeDInformation.cmake 2010-02-17 21:41:03 UTC (rev 10804)
+++ trunk/cmake/modules/CMakeDInformation.cmake 2010-02-18 21:38:39 UTC (rev 10805)
@@ -1,297 +0,0 @@
-#
-# CMakeD - CMake module for D Language
-#
-# Copyright (c) 2007, Selman Ulug <sel...@gm...>
-# Tim Burrell <tim...@gm...>
-#
-# All rights reserved.
-#
-# See Copyright.txt for details.
-#
-# Modified from CMake 2.6.5 CMakeCInformation.cmake
-# See http://www.cmake.org/HTML/Copyright.html for details
-#
-
-# This file sets the basic flags for the D language in CMake.
-# It also loads the available platform file for the system-compiler
-# if it exists.
-
-GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_D_COMPILER} NAME_WE)
-IF(CMAKE_COMPILER_IS_GDC)
- SET(CMAKE_BASE_NAME gdc)
-ELSE(CMAKE_COMPILER_IS_GDC)
- SET(CMAKE_BASE_NAME dmd)
-ENDIF(CMAKE_COMPILER_IS_GDC)
-SET(CMAKE_SYSTEM_AND_D_COMPILER_INFO_FILE
- ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
-INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
-
-# This should be included before the _INIT variables are
-# used to initialize the cache. Since the rule variables
-# have if blocks on them, users can still define them here.
-# But, it should still be after the platform file so changes can
-# be made to those values.
-
-IF(CMAKE_USER_MAKE_RULES_OVERRIDE)
- INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE})
-ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE)
-
-IF(CMAKE_USER_MAKE_RULES_OVERRIDE_D)
- INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE_D})
-ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE_D)
-
-# Create a set of shared library variable specific to D
-# For 90% of the systems, these are the same flags as the C versions
-# so if these are not set just copy the flags from the c version
-IF(NOT CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS)
- SET(CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS)
-
-IF(NOT CMAKE_SHARED_LIBRARY_D_FLAGS)
- SET(CMAKE_SHARED_LIBRARY_D_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_D_FLAGS)
-
-IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_D_FLAGS)
- SET(CMAKE_SHARED_LIBRARY_LINK_D_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS})
-ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_D_FLAGS)
-
-IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_D_FLAG)
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_D_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_D_FLAG)
-
-IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_D_FLAG_SEP)
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_D_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_D_FLAG_SEP)
-
-IF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_D_FLAG)
- SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_D_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_D_FLAG)
-
-# repeat for modules
-IF(NOT CMAKE_SHARED_MODULE_CREATE_D_FLAGS)
- SET(CMAKE_SHARED_MODULE_CREATE_D_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS})
-ENDIF(NOT CMAKE_SHARED_MODULE_CREATE_D_FLAGS)
-
-IF(NOT CMAKE_SHARED_MODULE_D_FLAGS)
- SET(CMAKE_SHARED_MODULE_D_FLAGS ${CMAKE_SHARED_MODULE_C_FLAGS})
-ENDIF(NOT CMAKE_SHARED_MODULE_D_FLAGS)
-
-IF(NOT CMAKE_SHARED_MODULE_RUNTIME_D_FLAG)
- SET(CMAKE_SHARED_MODULE_RUNTIME_D_FLAG ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG})
-ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_D_FLAG)
-
-IF(NOT CMAKE_SHARED_MODULE_RUNTIME_D_FLAG_SEP)
- SET(CMAKE_SHARED_MODULE_RUNTIME_D_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP})
-ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_D_FLAG_SEP)
-
-IF(NOT CMAKE_EXECUTABLE_RUNTIME_D_FLAG)
- SET(CMAKE_EXECUTABLE_RUNTIME_D_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_D_FLAG})
-ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_D_FLAG)
-
-IF(NOT CMAKE_EXECUTABLE_RUNTIME_D_FLAG_SEP)
- SET(CMAKE_EXECUTABLE_RUNTIME_D_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_D_FLAG_SEP})
-ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_D_FLAG_SEP)
-
-IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_D_FLAG)
- SET(CMAKE_EXECUTABLE_RPATH_LINK_D_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_D_FLAG})
-ENDIF(NOT CMAKE_EXECUTABLE_RPATH_LINK_D_FLAG)
-
-IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_D_WITH_RUNTIME_PATH)
- SET(CMAKE_SHARED_LIBRARY_LINK_D_WITH_RUNTIME_PATH ${CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH})
-ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_D_WITH_RUNTIME_PATH)
-
-IF(NOT CMAKE_INCLUDE_FLAG_D)
- SET(CMAKE_INCLUDE_FLAG_D ${CMAKE_INCLUDE_FLAG_C})
-ENDIF(NOT CMAKE_INCLUDE_FLAG_D)
-
-IF(NOT CMAKE_INCLUDE_FLAG_SEP_D)
- SET(CMAKE_INCLUDE_FLAG_SEP_D ${CMAKE_INCLUDE_FLAG_SEP_C})
-ENDIF(NOT CMAKE_INCLUDE_FLAG_SEP_D)
-
-SET (CMAKE_D_FLAGS "$ENV{CFLAGS} ${CMAKE_D_FLAGS_INIT}" CACHE STRING
- "Flags for D compiler.")
-
-IF(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
-# default build type is none
- IF(NOT CMAKE_NO_BUILD_TYPE)
- SET (CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE_INIT} CACHE STRING
- "Choose the type of build, options are: None(CMAKE_D_FLAGS used) Debug Release RelWithDebInfo MinSizeRel.")
- ENDIF(NOT CMAKE_NO_BUILD_TYPE)
- SET (CMAKE_D_FLAGS_DEBUG "${CMAKE_D_FLAGS_DEBUG_INIT}" CACHE STRING
- "Flags used by the compiler during debug builds.")
- SET (CMAKE_D_FLAGS_MINSIZEREL "${CMAKE_D_FLAGS_MINSIZEREL_INIT}" CACHE STRING
- "Flags used by the compiler during release minsize builds.")
- SET (CMAKE_D_FLAGS_RELEASE "${CMAKE_D_FLAGS_RELEASE_INIT}" CACHE STRING
- "Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files).")
- SET (CMAKE_D_FLAGS_RELWITHDEBINFO "${CMAKE_D_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
- "Flags used by the compiler during Release with Debug Info builds.")
-ENDIF(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
-
-IF(CMAKE_D_STANDARD_LIBRARIES_INIT)
- SET(CMAKE_D_STANDARD_LIBRARIES "${CMAKE_D_STANDARD_LIBRARIES_INIT}"
- CACHE STRING "Libraries linked by default with all D applications.")
- MARK_AS_ADVANCED(CMAKE_D_STANDARD_LIBRARIES)
-ENDIF(CMAKE_D_STANDARD_LIBRARIES_INIT)
-
-INCLUDE(CMakeCommonLanguageInclude)
-
-# now define the following rule variables
-
-# CMAKE_D_CREATE_SHARED_LIBRARY
-# CMAKE_D_CREATE_SHARED_MODULE
-# CMAKE_D_CREATE_STATIC_LIBRARY
-# CMAKE_D_COMPILE_OBJECT
-# CMAKE_D_LINK_EXECUTABLE
-
-# variables supplied by the generator at use time
-# <TARGET>
-# <TARGET_BASE> the target without the suffix
-# <OBJECTS>
-# <OBJECT>
-# <LINK_LIBRARIES>
-# <FLAGS>
-# <LINK_FLAGS>
-
-# D compiler information
-# <CMAKE_D_COMPILER>
-# <CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS>
-# <CMAKE_SHARED_MODULE_CREATE_D_FLAGS>
-# <CMAKE_D_LINK_FLAGS>
-
-# Static library tools
-# <CMAKE_AR>
-# <CMAKE_RANLIB>
-
-IF("$ENV{D_PATH}" STREQUAL "")
- STRING(LENGTH ${CMAKE_D_COMPILER} CMAKE_D_COMPILER_LENGTH)
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- MATH(EXPR CMAKE_D_COMPILER_LENGTH "${CMAKE_D_COMPILER_LENGTH} - 12")
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- MATH(EXPR CMAKE_D_COMPILER_LENGTH "${CMAKE_D_COMPILER_LENGTH} - 8")
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- STRING(SUBSTRING ${CMAKE_D_COMPILER} 0 ${CMAKE_D_COMPILER_LENGTH} D_PATH)
-ELSE("$ENV{D_PATH}" STREQUAL "")
- SET(D_PATH "$ENV{D_PATH}")
-ENDIF("$ENV{D_PATH}" STREQUAL "")
-MESSAGE(STATUS "D Compiler Install Prefix (use D_PATH env var to override): ${D_PATH}")
-
-IF(CMAKE_COMPILER_IS_GDC)
- SET(CMAKE_OUTPUT_D_FLAG "-o ")
- SET(CMAKE_SHARED_LIBRARY_D_FLAGS "-fPIC")
- SET(CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS "-shared")
- SET(CMAKE_INCLUDE_FLAG_D "-I") # -I
- SET(CMAKE_INCLUDE_FLAG_D_SEP "") # , or empty
- SET(CMAKE_LIBRARY_PATH_FLAG "-L")
- SET(CMAKE_LINK_LIBRARY_FLAG "-l")
- SET(CMAKE_D_VERSION_FLAG "-fversion=")
-ELSE(CMAKE_COMPILER_IS_GDC)
- SET(CMAKE_OUTPUT_D_FLAG "-of")
- SET(CMAKE_D_VERSION_FLAG "-version=")
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- SET(CMAKE_INCLUDE_FLAG_D "-I") # -I
- SET(CMAKE_INCLUDE_FLAG_D_SEP "") # , or empty
- SET(CMAKE_LINK_LIBRARY_FLAG "-L+")
- SET(CMAKE_LIBRARY_PATH_FLAG "-L+")
- SET(CMAKE_LIBRARY_PATH_TERMINATOR "\\")
- FIND_PROGRAM(DMD_LIBRARIAN "lib.exe")
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- SET(CMAKE_SHARED_LIBRARY_D_FLAGS "-fPIC")
- SET(CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS "-shared")
- SET(CMAKE_INCLUDE_FLAG_D "-I") # -I
- SET(CMAKE_INCLUDE_FLAG_D_SEP "") # , or empty
- SET(CMAKE_LIBRARY_PATH_FLAG "-L")
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-ENDIF(CMAKE_COMPILER_IS_GDC)
-
-IF(CMAKE_D_USE_TANGO)
- IF(CMAKE_COMPILER_IS_GDC)
- SET(DSTDLIB_TYPE "-fversion=Tango")
- SET(DSTDLIB_FLAGS "-lgtango")
- ELSE(CMAKE_COMPILER_IS_GDC)
- SET(DSTDLIB_TYPE "-version=Tango")
- SET(DSTDLIB_FLAGS "-L${D_PATH}/lib -ltango -lphobos")
- ENDIF(CMAKE_COMPILER_IS_GDC)
-ENDIF(CMAKE_D_USE_TANGO)
-IF(CMAKE_D_USE_PHOBOS)
- IF(CMAKE_COMPILER_IS_GDC)
- SET(DSTDLIB_TYPE "-fversion=Phobos")
- SET(DSTDLIB_FLAGS "-lgphobos")
- ELSE(CMAKE_COMPILER_IS_GDC)
- SET(DSTDLIB_TYPE "-version=Phobos")
- SET(DSTDLIB_FLAGS "-L${D_PATH}/lib -lphobos")
- ENDIF(CMAKE_COMPILER_IS_GDC)
-ENDIF(CMAKE_D_USE_PHOBOS)
-
-# create a D shared library
-IF(NOT CMAKE_D_CREATE_SHARED_LIBRARY)
- IF(CMAKE_COMPILER_IS_GDC)
- SET(CMAKE_D_CREATE_SHARED_LIBRARY
- "<CMAKE_D_COMPILER> <CMAKE_SHARED_LIBRARY_D_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_D_FLAG><TARGET_SONAME> ${CMAKE_OUTPUT_D_FLAG}<TARGET> <OBJECTS> <LINK_LIBRARIES>")
- ELSE(CMAKE_COMPILER_IS_GDC)
- SET(CMAKE_D_CREATE_SHARED_LIBRARY
- "<CMAKE_D_COMPILER> <CMAKE_SHARED_LIBRARY_D_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_D_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_D_FLAG><TARGET_SONAME> ${CMAKE_OUTPUT_D_FLAG}<TARGET> <OBJECTS> <LINK_LIBRARIES> ${DSTDLIB_FLAGS}")
- ENDIF(CMAKE_COMPILER_IS_GDC)
-ENDIF(NOT CMAKE_D_CREATE_SHARED_LIBRARY)
-
-# create a D shared module just copy the shared library rule
-IF(NOT CMAKE_D_CREATE_SHARED_MODULE)
- SET(CMAKE_D_CREATE_SHARED_MODULE ${CMAKE_D_CREATE_SHARED_LIBRARY})
-ENDIF(NOT CMAKE_D_CREATE_SHARED_MODULE)
-
-# create a D static library
-IF(NOT CMAKE_D_CREATE_STATIC_LIBRARY)
- IF(CMAKE_COMPILER_IS_GDC)
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- SET(CMAKE_D_CREATE_STATIC_LIBRARY
- "<CMAKE_AR> cr <TARGET>.lib <LINK_FLAGS> <OBJECTS> "
- "<CMAKE_RANLIB> <TARGET>.lib "
- "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS> "
- "<CMAKE_RANLIB> <TARGET> "
- )
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- SET(CMAKE_D_CREATE_STATIC_LIBRARY
- "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS> "
- "<CMAKE_RANLIB> <TARGET> "
- )
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- ELSE(CMAKE_COMPILER_IS_GDC)
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- SET(CMAKE_D_CREATE_STATIC_LIBRARY
- "${DMD_LIBRARIAN} -c -p256 <TARGET> <OBJECTS>")
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- SET(CMAKE_D_CREATE_STATIC_LIBRARY
- "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>"
- "<CMAKE_RANLIB> <TARGET>")
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- ENDIF(CMAKE_COMPILER_IS_GDC)
-ENDIF(NOT CMAKE_D_CREATE_STATIC_LIBRARY)
-
-# compile a D file into an object file
-IF(NOT CMAKE_D_COMPILE_OBJECT)
- SET(CMAKE_D_COMPILE_OBJECT
- "<CMAKE_D_COMPILER> <FLAGS> ${CMAKE_OUTPUT_D_FLAG}<OBJECT> -c <SOURCE>")
-ENDIF(NOT CMAKE_D_COMPILE_OBJECT)
-
-IF(NOT CMAKE_D_LINK_EXECUTABLE)
- IF(CMAKE_COMPILER_IS_GDC)
- SET(CMAKE_D_LINK_EXECUTABLE
- "<CMAKE_D_COMPILER> <FLAGS> <CMAKE_D_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> ${CMAKE_OUTPUT_D_FLAG}<TARGET> <LINK_LIBRARIES> ${DSTDLIB_FLAGS} ${DSTDLIB_TYPE}")
- ELSE(CMAKE_COMPILER_IS_GDC)
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- SET(CMAKE_D_LINK_EXECUTABLE
- "<CMAKE_D_COMPILER> <FLAGS> <CMAKE_D_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> ${CMAKE_OUTPUT_D_FLAG}<TARGET> <LINK_LIBRARIES>")
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- SET(CMAKE_D_LINK_EXECUTABLE
- "gcc ${DLINK_FLAGS} <CMAKE_D_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -lpthread -lm ${DSTDLIB_FLAGS}")
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- ENDIF(CMAKE_COMPILER_IS_GDC)
-ENDIF(NOT CMAKE_D_LINK_EXECUTABLE)
-
-MARK_AS_ADVANCED(
-CMAKE_D_FLAGS
-CMAKE_D_FLAGS_DEBUG
-CMAKE_D_FLAGS_MINSIZEREL
-CMAKE_D_FLAGS_RELEASE
-CMAKE_D_FLAGS_RELWITHDEBINFO
-)
-SET(CMAKE_D_INFORMATION_LOADED 1)
Deleted: trunk/cmake/modules/CMakeD_Copyright.txt
===================================================================
--- trunk/cmake/modules/CMakeD_Copyright.txt 2010-02-17 21:41:03 UTC (rev 10804)
+++ trunk/cmake/modules/CMakeD_Copyright.txt 2010-02-18 21:38:39 UTC (rev 10805)
@@ -1,30 +0,0 @@
-CMakeD - CMake module for D Language
-
-Copyright (c) 2007, Selman Ulug <sel...@gm...>
- Tim Burrell <tim...@gm...>
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Deleted: trunk/cmake/modules/CMakeDetermineAdaCompiler.cmake
===================================================================
--- trunk/cmake/modules/CMakeDetermineAdaCompiler.cmake 2010-02-17 21:41:03 UTC (rev 10804)
+++ trunk/cmake/modules/CMakeDetermineAdaCompiler.cmake 2010-02-18 21:38:39 UTC (rev 10805)
@@ -1,62 +0,0 @@
-# Determine the compiler to use for Ada programs
-# NOTE, a generator may set CMAKE_Ada_COMPILER before
-# loading this file to force a compiler.
-# use environment variable ADA first if defined by user, next use
-# the cmake variable CMAKE_GENERATOR_ADA which can be defined by a generator
-# as a default compiler
-
-IF(NOT CMAKE_Ada_COMPILER)
-
- # prefer the environment variable ADA
- IF($ENV{ADA} MATCHES ".+")
- GET_FILENAME_COMPONENT(CMAKE_Ada_COMPILER_INIT $ENV{ADA} PROGRAM PROGRAM_ARGS CMAKE_Ada_FLAGS_ENV_INIT)
- IF(CMAKE_Ada_FLAGS_ENV_INIT)
- SET(CMAKE_Ada_COMPILER_ARG1 "${CMAKE_Ada_FLAGS_ENV_INIT}" CACHE STRING "First argument to Ada compiler")
- ENDIF(CMAKE_Ada_FLAGS_ENV_INIT)
- IF(EXISTS ${CMAKE_Ada_COMPILER_INIT})
- ELSE(EXISTS ${CMAKE_Ada_COMPILER_INIT})
- MESSAGE(FATAL_ERROR "Could not find compiler set in environment variable ADA:\n$ENV{ADA}.")
- ENDIF(EXISTS ${CMAKE_Ada_COMPILER_INIT})
- ENDIF($ENV{ADA} MATCHES ".+")
-
- # next try prefer the compiler specified by the generator
- IF(CMAKE_GENERATOR_ADA)
- IF(NOT CMAKE_Ada_COMPILER_INIT)
- SET(CMAKE_Ada_COMPILER_INIT ${CMAKE_GENERATOR_ADA})
- ENDIF(NOT CMAKE_Ada_COMPILER_INIT)
- ENDIF(CMAKE_GENERATOR_ADA)
-
- # finally list compilers to try
- IF(CMAKE_Ada_COMPILER_INIT)
- SET(CMAKE_Ada_COMPILER_LIST ${CMAKE_Ada_COMPILER_INIT})
- ELSE(CMAKE_Ada_COMPILER_INIT)
- SET(CMAKE_Ada_COMPILER_LIST gnatgcc gcc)
- ENDIF(CMAKE_Ada_COMPILER_INIT)
-
- # Find the compiler.
- FIND_PROGRAM(CMAKE_Ada_COMPILER NAMES ${CMAKE_Ada_COMPILER_LIST} DOC "Ada compiler")
- IF(CMAKE_Ada_COMPILER_INIT AND NOT CMAKE_Ada_COMPILER)
- SET(CMAKE_Ada_COMPILER "${CMAKE_Ada_COMPILER_INIT}" CACHE FILEPATH "Ada compiler" FORCE)
- ENDIF(CMAKE_Ada_COMPILER_INIT AND NOT CMAKE_Ada_COMPILER)
-ENDIF(NOT CMAKE_Ada_COMPILER)
-MARK_AS_ADVANCED(CMAKE_Ada_COMPILER)
-
-GET_FILENAME_COMPONENT(COMPILER_LOCATION "${CMAKE_Ada_COMPILER}"
- PATH)
-
-FIND_PROGRAM(GNAT_EXECUTABLE_BUILDER NAMES gnatmake PATHS ${COMPILER_LOCATION} )
-FIND_PROGRAM(CMAKE_AR NAMES ar PATHS ${COMPILER_LOCATION} )
-
-FIND_PROGRAM(CMAKE_RANLIB NAMES ranlib)
-IF(NOT CMAKE_RANLIB)
- SET(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib")
-ENDIF(NOT CMAKE_RANLIB)
-MARK_AS_ADVANCED(CMAKE_RANLIB)
-
-# configure variables set in this file for fast reload later on
-#CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeAdaCompiler.cmake.in
-CONFIGURE_FILE(${CMAKE_MODULE_PATH}/CMakeAdaCompiler.cmake.in
- "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeAdaCompiler.cmake" IMMEDIATE)
-MARK_AS_ADVANCED(CMAKE_AR)
-
-SET(CMAKE_Ada_COMPILER_ENV_VAR "ADA")
Deleted: trunk/cmake/modules/CMakeDetermineDCompiler.cmake
===================================================================
--- trunk/cmake/modules/CMakeDetermineDCompiler.cmake 2010-02-17 21:41:03 UTC (rev 10804)
+++ trunk/cmake/modules/CMakeDetermineDCompiler.cmake 2010-02-18 21:38:39 UTC (rev 10805)
@@ -1,108 +0,0 @@
-#
-# CMakeD - CMake module for D Language
-#
-# Copyright (c) 2007, Selman Ulug <sel...@gm...>
-# Tim Burrell <tim...@gm...>
-#
-# All rights reserved.
-#
-# See Copyright.txt for details.
-#
-# Modified from CMake 2.6.5 CMakeDetermineCCompiler.cmake
-# See http://www.cmake.org/HTML/Copyright.html for details
-#
-
-# determine the compiler to use for D programs
-# NOTE, a generator may set CMAKE_D_COMPILER before
-# loading this file to force a compiler.
-# use environment variable DC first if defined by user, next use
-# the cmake variable CMAKE_GENERATOR_D which can be defined by a generator
-# as a default compiler
-
-IF(NOT CMAKE_D_COMPILER)
-
- # prefer the environment variable DC
- IF($ENV{DC} MATCHES ".+")
- GET_FILENAME_COMPONENT(CMAKE_D_COMPILER_INIT $ENV{DC} PROGRAM PROGRAM_ARGS CMAKE_D_FLAGS_ENV_INIT)
- IF(CMAKE_D_FLAGS_ENV_INIT)
- SET(CMAKE_D_COMPILER_ARG1 "${CMAKE_D_FLAGS_ENV_INIT}" CACHE STRING "First argument to D compiler")
- ENDIF(CMAKE_D_FLAGS_ENV_INIT)
- IF(EXISTS ${CMAKE_D_COMPILER_INIT})
- ELSE(EXISTS ${CMAKE_D_COMPILER_INIT})
- MESSAGE(FATAL_ERROR "Could not find compiler set in environment variable C:\n$ENV{DC}.")
- ENDIF(EXISTS ${CMAKE_D_COMPILER_INIT})
- ENDIF($ENV{DC} MATCHES ".+")
-
- # next try prefer the compiler specified by the generator
- IF(CMAKE_GENERATOR_D)
- IF(NOT CMAKE_D_COMPILER_INIT)
- SET(CMAKE_D_COMPILER_INIT ${CMAKE_GENERATOR_D})
- ENDIF(NOT CMAKE_D_COMPILER_INIT)
- ENDIF(CMAKE_GENERATOR_D)
-
- # finally list compilers to try
- IF(CMAKE_D_COMPILER_INIT)
- SET(CMAKE_D_COMPILER_LIST ${CMAKE_D_COMPILER_INIT})
- ELSE(CMAKE_D_COMPILER_INIT)
- SET(CMAKE_D_COMPILER_LIST gdc dmd)
- ENDIF(CMAKE_D_COMPILER_INIT)
-
- # Find the compiler.
- FIND_PROGRAM(CMAKE_D_COMPILER NAMES ${CMAKE_D_COMPILER_LIST} DOC "C compiler")
- IF(CMAKE_D_COMPILER_INIT AND NOT CMAKE_D_COMPILER)
- SET(CMAKE_D_COMPILER "${CMAKE_D_COMPILER_INIT}" CACHE FILEPATH "C compiler" FORCE)
- ENDIF(CMAKE_D_COMPILER_INIT AND NOT CMAKE_D_COMPILER)
-ENDIF(NOT CMAKE_D_COMPILER)
-MARK_AS_ADVANCED(CMAKE_D_COMPILER)
-GET_FILENAME_COMPONENT(COMPILER_LOCATION "${CMAKE_D_COMPILER}" PATH)
-
-FIND_PROGRAM(CMAKE_AR NAMES ar PATHS ${COMPILER_LOCATION} )
-
-FIND_PROGRAM(CMAKE_RANLIB NAMES ranlib)
-IF(NOT CMAKE_RANLIB)
- SET(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib")
-ENDIF(NOT CMAKE_RANLIB)
-MARK_AS_ADVANCED(CMAKE_RANLIB)
-
-# do not test for GNU if the generator is visual studio
-IF(${CMAKE_GENERATOR} MATCHES "Visual Studio")
- SET(CMAKE_COMPILER_IS_GDC_RUN 1)
-ENDIF(${CMAKE_GENERATOR} MATCHES "Visual Studio")
-
-
-IF(NOT CMAKE_COMPILER_IS_GDC_RUN)
- # test to see if the d compiler is gdc
- SET(CMAKE_COMPILER_IS_GDC_RUN 1)
- IF("${CMAKE_D_COMPILER}" MATCHES ".*gdc.*" )
- SET(CMAKE_COMPILER_IS_GDC 1)
- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
- "Determining if the D compiler is GDC succeeded with "
- "the following output:\n${CMAKE_D_COMPILER}\n\n")
- EXEC_PROGRAM(${CMAKE_D_COMPILER} ARGS "--version" OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT)
- IF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*mingw.*" )
- SET(CMAKE_COMPILER_IS_MINGW 1)
- ENDIF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*mingw.*" )
- IF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*THIS_IS_CYGWIN.*" )
- SET(CMAKE_COMPILER_IS_CYGWIN 1)
- ENDIF("${CMAKE_COMPILER_OUTPUT}" MATCHES ".*THIS_IS_CYGWIN.*" )
- ELSE("${CMAKE_D_COMPILER}" MATCHES ".*dmd.*" )
- SET(CMAKE_COMPILER_IS_DMD 1)
- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
- "Determining if the D compiler is DMD succeeded with "
- "the following output:\n${CMAKE_D_COMPILER}\n\n")
- ENDIF("${CMAKE_D_COMPILER}" MATCHES ".*gdc.*" )
-ENDIF(NOT CMAKE_COMPILER_IS_GDC_RUN)
-
-
-# configure variables set in this file for fast reload later on
-IF(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in)
- CONFIGURE_FILE(${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in
- "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE)
-ELSE(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in)
- CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in
- "${CMAKE_PLATFORM_ROOT_BIN}/CMakeDCompiler.cmake" IMMEDIATE)
-ENDIF(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in)
-
-MARK_AS_ADVANCED(CMAKE_AR)
-SET(CMAKE_D_COMPILER_ENV_VAR "DC")
-
Deleted: trunk/cmake/modules/CMakeFortranInformation.cmake
===================================================================
--- trunk/cmake/modules/CMakeFortranInformation.cmake 2010-02-17 21:41:03 UTC (rev 10804)
+++ trunk/cmake/modules/CMakeFortranInformation.cmake 2010-02-18 21:38:39 UTC (rev 10805)
@@ -1,189 +0,0 @@
-
-# This file sets the basic flags for the Fortran language in CMake.
-# It also loads the available platform file for the system-compiler
-# if it exists.
-
-GET_FILENAME_COMPONENT(CMAKE_BASE_NAME ${CMAKE_Fortran_COMPILER} NAME_WE)
-# since the gnu compiler has several names force g++
-IF(CMAKE_COMPILER_IS_GNUG77)
- SET(CMAKE_BASE_NAME g77)
-ENDIF(CMAKE_COMPILER_IS_GNUG77)
-IF(CMAKE_Fortran_COMPILER_ID)
- IF(EXISTS ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_ID}-Fortran.cmake OR EXISTS ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_ID}-Fortran.cmake)
- SET(CMAKE_BASE_NAME ${CMAKE_Fortran_COMPILER_ID}-Fortran)
- ENDIF(EXISTS ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_ID}-Fortran.cmake OR EXISTS ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_Fortran_COMPILER_ID}-Fortran.cmake)
-ENDIF(CMAKE_Fortran_COMPILER_ID)
-IF(EXISTS ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
- # Use this file if it exists.
- SET(CMAKE_SYSTEM_AND_Fortran_COMPILER_INFO_FILE
- ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
-ELSE(EXISTS ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
- # This one apparently doesn't have to actually exist, see OPTIONAL below.
- SET(CMAKE_SYSTEM_AND_Fortran_COMPILER_INFO_FILE
- ${CMAKE_ROOT}/Modules/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
-ENDIF(EXISTS ${CMAKE_MODULE_PATH}/Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME}.cmake)
-INCLUDE(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL)
-
-# This should be included before the _INIT variables are
-# used to initialize the cache. Since the rule variables
-# have if blocks on them, users can still define them here.
-# But, it should still be after the platform file so changes can
-# be made to those values.
-
-IF(CMAKE_USER_MAKE_RULES_OVERRIDE)
- INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE})
-ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE)
-
-IF(CMAKE_USER_MAKE_RULES_OVERRIDE_Fortran)
- INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE_Fortran})
-ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE_Fortran)
-
-
-# Fortran needs cmake to do a requires step during its build process to
-# catch any modules
-SET(CMAKE_NEEDS_REQUIRES_STEP_Fortran_FLAG 1)
-
-# Create a set of shared library variable specific to Fortran
-# For 90% of the systems, these are the same flags as the C versions
-# so if these are not set just copy the flags from the c version
-IF(NOT CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS)
- SET(CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS)
-
-IF(NOT CMAKE_SHARED_LIBRARY_Fortran_FLAGS)
- SET(CMAKE_SHARED_LIBRARY_Fortran_FLAGS ${CMAKE_SHARED_LIBRARY_C_FLAGS})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_Fortran_FLAGS)
-
-IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS)
- SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS})
-ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Fortran_FLAGS)
-
-IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG)
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG)
-
-IF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP)
- SET(CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP)
-
-IF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Fortran_FLAG)
- SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG})
-ENDIF(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Fortran_FLAG)
-
-# repeat for modules
-IF(NOT CMAKE_SHARED_MODULE_CREATE_Fortran_FLAGS)
- SET(CMAKE_SHARED_MODULE_CREATE_Fortran_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS})
-ENDIF(NOT CMAKE_SHARED_MODULE_CREATE_Fortran_FLAGS)
-
-IF(NOT CMAKE_SHARED_MODULE_Fortran_FLAGS)
- SET(CMAKE_SHARED_MODULE_Fortran_FLAGS ${CMAKE_SHARED_MODULE_C_FLAGS})
-ENDIF(NOT CMAKE_SHARED_MODULE_Fortran_FLAGS)
-
-IF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG)
- SET(CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG})
-ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG)
-
-IF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP)
- SET(CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP})
-ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Fortran_FLAG_SEP)
-
-IF(NOT CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG)
- SET(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG})
-ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG)
-
-IF(NOT CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG_SEP)
- SET(CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_Fortran_FLAG_SEP})
-ENDIF(NOT CMAKE_EXECUTABLE_RUNTIME_Fortran_FLAG_SEP)
-
-IF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Fortran_FLAG)
- SET(CMAKE_EXECUTABLE_RPATH_LINK_Fortran_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_Fortran_FLAG})
-ENDIF(NOT CMAKE_EXECUTABLE_RPATH_LINK_Fortran_FLAG)
-
-IF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Fortran_WITH_RUNTIME_PATH)
- SET(CMAKE_SHARED_LIBRARY_LINK_Fortran_WITH_RUNTIME_PATH ${CMAKE_SHARED_LIBRARY_LINK_C_WITH_RUNTIME_PATH})
-ENDIF(NOT DEFINED CMAKE_SHARED_LIBRARY_LINK_Fortran_WITH_RUNTIME_PATH)
-
-IF(NOT CMAKE_INCLUDE_FLAG_Fortran)
- SET(CMAKE_INCLUDE_FLAG_Fortran ${CMAKE_INCLUDE_FLAG_C})
-ENDIF(NOT CMAKE_INCLUDE_FLAG_Fortran)
-
-IF(NOT CMAKE_INCLUDE_FLAG_SEP_Fortran)
- SET(CMAKE_INCLUDE_FLAG_SEP_Fortran ${CMAKE_INCLUDE_FLAG_SEP_C})
-ENDIF(NOT CMAKE_INCLUDE_FLAG_SEP_Fortran)
-
-SET(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.")
-
-SET(CMAKE_Fortran_FLAGS_INIT "$ENV{FFLAGS} ${CMAKE_Fortran_FLAGS_INIT}")
-# avoid just having a space as the initial value for the cache
-IF(CMAKE_Fortran_FLAGS_INIT STREQUAL " ")
- SET(CMAKE_Fortran_FLAGS_INIT)
-ENDIF(CMAKE_Fortran_FLAGS_INIT STREQUAL " ")
-SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS_INIT}" CACHE STRING
- "Flags for Fortran compiler.")
-
-INCLUDE(CMakeCommonLanguageInclude)
-
-# now define the following rule variables
-# CMAKE_Fortran_CREATE_SHARED_LIBRARY
-# CMAKE_Fortran_CREATE_SHARED_MODULE
-# CMAKE_Fortran_CREATE_STATIC_LIBRARY
-# CMAKE_Fortran_COMPILE_OBJECT
-# CMAKE_Fortran_LINK_EXECUTABLE
-
-# create a Fortran shared library
-IF(NOT CMAKE_Fortran_CREATE_SHARED_LIBRARY)
- SET(CMAKE_Fortran_CREATE_SHARED_LIBRARY
- "<CMAKE_Fortran_COMPILER> <CMAKE_SHARED_LIBRARY_Fortran_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Fortran_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_Fortran_FLAG><TARGET_SONAME> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
-ENDIF(NOT CMAKE_Fortran_CREATE_SHARED_LIBRARY)
-
-# create a Fortran shared module just copy the shared library rule
-IF(NOT CMAKE_Fortran_CREATE_SHARED_MODULE)
- SET(CMAKE_Fortran_CREATE_SHARED_MODULE ${CMAKE_Fortran_CREATE_SHARED_LIBRARY})
-ENDIF(NOT CMAKE_Fortran_CREATE_SHARED_MODULE)
-
-# create a Fortran static library
-IF(NOT CMAKE_Fortran_CREATE_STATIC_LIBRARY)
- SET(CMAKE_Fortran_CREATE_STATIC_LIBRARY
- "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS> "
- "<CMAKE_RANLIB> <TARGET> ")
-ENDIF(NOT CMAKE_Fortran_CREATE_STATIC_LIBRARY)
-
-# compile a Fortran file into an object file
-IF(NOT CMAKE_Fortran_COMPILE_OBJECT)
- SET(CMAKE_Fortran_COMPILE_OBJECT
- "<CMAKE_Fortran_COMPILER> -o <OBJECT> <DEFINES> <FLAGS> -c <SOURCE>")
-ENDIF(NOT CMAKE_Fortran_COMPILE_OBJECT)
-
-# link a fortran program
-IF(NOT CMAKE_Fortran_LINK_EXECUTABLE)
- SET(CMAKE_Fortran_LINK_EXECUTABLE
- "<CMAKE_Fortran_COMPILER> <CMAKE_Fortran_LINK_FLAGS> <LINK_FLAGS> <FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
-ENDIF(NOT CMAKE_Fortran_LINK_EXECUTABLE)
-
-IF(CMAKE_Fortran_STANDARD_LIBRARIES_INIT)
- SET(CMAKE_Fortran_STANDARD_LIBRARIES "${CMAKE_Fortran_STANDARD_LIBRARIES_INIT}"
- CACHE STRING "Libraries linked by defalut with all Fortran applications.")
- MARK_AS_ADVANCED(CMAKE_Fortran_STANDARD_LIBRARIES)
-ENDIF(CMAKE_Fortran_STANDARD_LIBRARIES_INIT)
-
-IF(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
- SET (CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG_INIT}" CACHE STRING
- "Flags used by the compiler during debug builds.")
- SET (CMAKE_Fortran_FLAGS_MINSIZEREL "${CMAKE_Fortran_FLAGS_MINSIZEREL_INIT}" CACHE STRING
- "Flags used by the compiler during release minsize builds.")
- SET (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE_INIT}" CACHE STRING
- "Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files).")
- SET (CMAKE_Fortran_FLAGS_RELWITHDEBINFO "${CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
- "Flags used by the compiler during Release with Debug Info builds.")
-
-ENDIF(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
-
-MARK_AS_ADVANCED(
-CMAKE_Fortran_FLAGS
-CMAKE_Fortran_FLAGS_DEBUG
-CMAKE_Fortran_FLAGS_MINSIZEREL
-CMAKE_Fortran_FLAGS_RELEASE
-CMAKE_Fortran_FLAGS_RELWITHDEBINFO)
-
-# set this variable so we can avoid loading this more than once.
-SET(CMAKE_Fortran_INFORMATION_LOADED 1)
Deleted: trunk/cmake/modules/CMakeTestAdaCompiler.cmake
===================================================================
--- trunk/cmake/modules/CMakeTestAdaCompiler.cmake 2010-02-17 21:41:03 UTC (rev 10804)
+++ trunk/cmake/modules/CMakeTestAdaCompiler.cmake 2010-02-18 21:38:39 UTC (rev 10805)
@@ -1,60 +0,0 @@
-# This file is used by EnableLanguage in cmGlobalGenerator to determine that
-# the Ada builder GNAT_EXECUTABLE_BUILDER = gnatmake can actually compile
-# and link the most basic of programs. If not, a fatal error is set and
-# cmake stops processing commands and will not generate any makefiles or
-# projects.
-
-IF(NOT CMAKE_Ada_COMPILER_WORKS)
- MESSAGE(STATUS "Check for working Ada builder: ${GNAT_EXECUTABLE_BUILDER}")
- FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testadacompiler.adb
- "
-procedure testAdaCompiler is
-begin
- null;
-end;
- "
- )
-
- FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CMakeLists.txt
- "
-# FIXME: This specific location currently needs to be changed whenever the
-# location of the experimental Ada support files is changed.
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
-set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL \"\" FORCE)
-project(test Ada)
-add_executable(testadacompiler testadacompiler.adb)
- "
- )
-
-# To avoid try_compile recurse error, use any binary directory other than
-# ${CMAKE_BINARY_DIR}. The choice of
-# bindir = ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp is
-# especially advantageous since it makes an in-source build which
-# means that no special variables need to be set to find files.
- try_compile(CMAKE_Ada_COMPILER_WORKS
- ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
- ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp
- projectName
- OUTPUT_VARIABLE OUTPUT
- )
- SET(ADA_TEST_WAS_RUN 1)
-ENDIF(NOT CMAKE_Ada_COMPILER_WORKS)
-
-IF(NOT CMAKE_Ada_COMPILER_WORKS)
- MESSAGE(STATUS "Check for working Ada builder: ${GNAT_EXECUTABLE_BUILDER} -- broken")
- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
- "Determining if the Ada builder works failed with "
- "the following output:\n${OUTPUT}\n\n")
- MESSAGE(FATAL_ERROR "The Ada builder \"${GNAT_EXECUTABLE_BUILDER}\" "
- "is not able to compile, bind, and link a simple test program.\nIt fails "
- "with the following output:\n ${OUTPUT}\n\n"
- "CMake will not be able to correctly generate this project.")
-ELSE(NOT CMAKE_Ada_COMPILER_WORKS)
- IF(ADA_TEST_WAS_RUN)
- MESSAGE(STATUS "Check for working Ada builder: ${GNAT_EXECUTABLE_BUILDER} -- works")
- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
- "Determining if the Ada builder works passed with "
- "the following output:\n${OUTPUT}\n\n")
- ENDIF(ADA_TEST_WAS_RUN)
- SET(CMAKE_Ada_COMPILER_WORKS 1 CACHE INTERNAL "")
-ENDIF(NOT CMAKE_Ada_COMPILER_WORKS)
Deleted: trunk/cmake/modules/CMakeTestDCompiler.cmake
===================================================================
--- trunk/cmake/modules/CMakeTestDCompiler.cmake 2010-02-17 21:41:03 UTC (rev 10804)
+++ trunk/cmake/modules/CMakeTestDCompiler.cmake 2010-02-18 21:38:39 UTC (rev 10805)
@@ -1,175 +0,0 @@
-#
-# CMakeD - CMake module for D Language
-#
-# Copyright (c) 2007, Selman Ulug <sel...@gm...>
-# Tim Burrell <tim...@gm...>
-#
-# All rights reserved.
-#
-# See Copyright.txt for details.
-#
-# Modified from CMake 2.6.5 CMakeTestCCompiler.cmake
-# See http://www.cmake.org/HTML/Copyright.html for details
-#
-
-# This file is used by EnableLanguage in cmGlobalGenerator to
-# determine that that selected D compiler can actually compile
-# and link the most basic of programs. If not, a fatal error
-# is set and cmake stops processing commands and will not generate
-# any makefiles or projects.
-
-IF(NOT CMAKE_D_COMPILER_WORKS)
- MESSAGE(STATUS "Check for working D compiler: ${CMAKE_D_COMPILER}")
- FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- "int main(char[][] args)\n"
- "{return args.sizeof-1;}\n")
- STRING(REGEX MATCH "dmd" DMDTEST "${CMAKE_D_COMPILER}")
- IF(DMDTEST STREQUAL "dmd")
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- OUTPUT_VARIABLE OUTPUT)
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos.a"
- OUTPUT_VARIABLE OUTPUT)
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- ELSE(DMDTEST STREQUAL "dmd")
- TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- OUTPUT_VARIABLE OUTPUT)
- ENDIF(DMDTEST STREQUAL "dmd")
- SET(C_TEST_WAS_RUN 1)
-ENDIF(NOT CMAKE_D_COMPILER_WORKS)
-
-IF(NOT CMAKE_D_COMPILER_WORKS)
- MESSAGE(STATUS "Check for working D compiler: ${CMAKE_D_COMPILER} -- broken")
- message(STATUS "To force a specific D compiler set the DC environment variable")
- message(STATUS " ie - export DC=\"/opt/dmd/bin/dmd\"")
- message(STATUS "If the D path is not set please use the D_PATH variable")
- message(STATUS " ie - export D_PATH=\"/opt/dmd\"")
- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
- "Determining if the D compiler works failed with "
- "the following output:\n${OUTPUT}\n\n")
- MESSAGE(FATAL_ERROR "The D compiler \"${CMAKE_D_COMPILER}\" "
- "is not able to compile a simple test program.\nIt fails "
- "with the following output:\n ${OUTPUT}\n\n"
- "CMake will not be able to correctly generate this project.")
-ELSE(NOT CMAKE_D_COMPILER_WORKS)
- IF(C_TEST_WAS_RUN)
- MESSAGE(STATUS "Check for working D compiler: ${CMAKE_D_COMPILER} -- works")
- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
- "Determining if the D compiler works passed with "
- "the following output:\n${OUTPUT}\n\n")
- ENDIF(C_TEST_WAS_RUN)
- SET(CMAKE_D_COMPILER_WORKS 1 CACHE INTERNAL "")
- # re-configure this file CMakeDCompiler.cmake so that it gets
- # the value for CMAKE_SIZEOF_VOID_P
- # configure variables set in this file for fast reload later on
- IF(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in)
- CONFIGURE_FILE(${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in
- ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake IMMEDIATE)
- ELSE(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in)
- CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in
- ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeDCompiler.cmake IMMEDIATE)
- ENDIF(EXISTS ${CMAKE_MODULE_PATH}/CMakeDCompiler.cmake.in)
-ENDIF(NOT CMAKE_D_COMPILER_WORKS)
-
-IF(NOT CMAKE_D_PHOBOS_WORKS)
- MESSAGE(STATUS "Check for working Phobos")
- FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- "import std.stdio;\n"
- "int main(char[][] args)\n"
- "{ writefln(\"%s\", args[0]); return args.sizeof-1;}\n")
- IF(CMAKE_COMPILER_IS_GDC)
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- #CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos"
- OUTPUT_VARIABLE OUTPUT)
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos"
- OUTPUT_VARIABLE OUTPUT)
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- ELSE(CMAKE_COMPILER_IS_GDC)
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- OUTPUT_VARIABLE OUTPUT)
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos.a"
- COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import"
- OUTPUT_VARIABLE OUTPUT)
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- ENDIF(CMAKE_COMPILER_IS_GDC)
- SET(C_TEST_WAS_RUN 1)
-ENDIF(NOT CMAKE_D_PHOBOS_WORKS)
-
-IF(NOT CMAKE_D_PHOBOS_WORKS)
- MESSAGE(STATUS "Check for working Phobos -- unavailable")
- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
- "Determining if Phobos works failed with "
- "the following output:\n${OUTPUT}\n\n")
- #MESSAGE(FATAL_ERROR "Phobos does not work")
-ELSE(NOT CMAKE_D_PHOBOS_WORKS)
- IF(C_TEST_WAS_RUN)
- MESSAGE(STATUS "Check for working Phobos -- works")
- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
- "Determining if Phobos works passed with "
- "the following output:\n${OUTPUT}\n\n")
- ENDIF(C_TEST_WAS_RUN)
- SET(CMAKE_D_PHOBOS_WORKS 1 CACHE INTERNAL "")
-ENDIF(NOT CMAKE_D_PHOBOS_WORKS)
-
-IF(NOT CMAKE_D_TANGO_WORKS)
- MESSAGE(STATUS "Check for working Tango")
- FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- "import tango.io.Stdout;"
- "int main(char[][] args)\n"
- "{Stdout.newline();return args.sizeof-1;}\n")
- IF(CMAKE_COMPILER_IS_GDC)
- TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAK...
[truncated message content] |
