finish off by replacing remaining Ada occurencies cmake_pascal
authorkoda
Fri, 22 Mar 2013 10:40:48 +0100
branchcmake_pascal
changeset 8831 06562cd68897
parent 8829 6940e86a7df6
child 8834 edceeafff671
finish off by replacing remaining Ada occurencies
cmake_modules/CMakePascalInformation.cmake
--- a/cmake_modules/CMakePascalInformation.cmake	Fri Mar 22 10:34:50 2013 +0100
+++ b/cmake_modules/CMakePascalInformation.cmake	Fri Mar 22 10:40:48 2013 +0100
@@ -31,10 +31,12 @@
 # Create a set of shared library variable specific to Pascal
 # 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)
+
+# No flags supported during linking as a shell script takes care of it
+IF(NOT CMAKE_SHARED_LIBRARY_CREATE_Pascal_FLAGS)
 #-dynamiclib -Wl,-headerpad_max_install_names for C
-#  SET(CMAKE_SHARED_LIBRARY_CREATE_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
-#ENDIF(NOT CMAKE_SHARED_LIBRARY_CREATE_Ada_FLAGS)
+  SET(CMAKE_SHARED_LIBRARY_CREATE_Pascal_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
+ENDIF(NOT CMAKE_SHARED_LIBRARY_CREATE_Pascal_FLAGS)
 
 if(NOT CMAKE_SHARED_LIBRARY_Pascal_FLAGS)
     #another similarity, fpc: -fPIC  Same as -Cg
@@ -46,13 +48,13 @@
     set(CMAKE_SHARED_LIBRARY_LINK_Pascal_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS})
 endif(NOT CMAKE_SHARED_LIBRARY_LINK_Pascal_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_Pascal_FLAG)
+#  SET(CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG})
+#ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_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_RUNTIME_Pascal_FLAG_SEP)
+#  SET(CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG_SEP ${CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP})
+#ENDIF(NOT CMAKE_SHARED_LIBRARY_RUNTIME_Pascal_FLAG_SEP)
 
 if(NOT CMAKE_SHARED_LIBRARY_RPATH_LINK_Pascal_FLAG)
     set(CMAKE_SHARED_LIBRARY_RPATH_LINK_Pascal_FLAG ${CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG})
@@ -67,21 +69,21 @@
 endif(NOT CMAKE_MODULE_EXISTS)
 
 # 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_CREATE_Pascal_FLAGS)
+  SET(CMAKE_SHARED_MODULE_CREATE_Pascal_FLAGS ${CMAKE_SHARED_MODULE_CREATE_C_FLAGS})
+ENDIF(NOT CMAKE_SHARED_MODULE_CREATE_Pascal_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_Pascal_FLAGS)
+  SET(CMAKE_SHARED_MODULE_Pascal_FLAGS ${CMAKE_SHARED_MODULE_C_FLAGS})
+ENDIF(NOT CMAKE_SHARED_MODULE_Pascal_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_Pascal_FLAG)
+  SET(CMAKE_SHARED_MODULE_RUNTIME_Pascal_FLAG ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG})
+ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Pascal_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_SHARED_MODULE_RUNTIME_Pascal_FLAG_SEP)
+  SET(CMAKE_SHARED_MODULE_RUNTIME_Pascal_FLAG_SEP ${CMAKE_SHARED_MODULE_RUNTIME_C_FLAG_SEP})
+ENDIF(NOT CMAKE_SHARED_MODULE_RUNTIME_Pascal_FLAG_SEP)
 
 if(NOT CMAKE_INCLUDE_FLAG_Pascal)
     #amazing, fpc: -I<x>  Add <x> to include path
@@ -105,11 +107,11 @@
 
 # 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
+# CMAKE_Pascal_CREATE_SHARED_LIBRARY
+# CMAKE_Pascal_CREATE_SHARED_MODULE
+# CMAKE_Pascal_CREATE_STATIC_LIBRARY
+# CMAKE_Pascal_COMPILE_OBJECT
+# CMAKE_Pascal_LINK_EXECUTABLE
 
 # variables supplied by the generator at use time
 # <TARGET>
@@ -120,11 +122,11 @@
 # <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>
+# Pascal compiler information
+# <CMAKE_Pascal_COMPILER>
+# <CMAKE_SHARED_LIBRARY_CREATE_Pascal_FLAGS>
+# <CMAKE_SHARED_MODULE_CREATE_Pascal_FLAGS>
+# <CMAKE_Pascal_LINK_FLAGS>
 
 # Static library tools
 # <CMAKE_AR>
@@ -144,10 +146,10 @@
 # other expandable variables here are <CMAKE_Pascal_COMPILER> <CMAKE_SHARED_LIBRARY_Pascal_FLAGS> <LANGUAGE_COMPILE_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_Pascal_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_Pascal_FLAG> <TARGET_SONAME> <TARGET> <OBJECTS> <LINK_LIBRARIES>
 endif(NOT CMAKE_Pascal_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 Pascal shared module just copy the shared library rule
+IF(NOT CMAKE_Pascal_CREATE_SHARED_MODULE)
+  SET(CMAKE_Pascal_CREATE_SHARED_MODULE ${CMAKE_Pascal_CREATE_SHARED_LIBRARY})
+ENDIF(NOT CMAKE_Pascal_CREATE_SHARED_MODULE)
 
 # create an Pascal static library (unsupported)
 IF(NOT CMAKE_Pascal_CREATE_STATIC_LIBRARY)