From: <ai...@us...> - 2010-01-08 17:54:58
|
Revision: 10749 http://plplot.svn.sourceforge.net/plplot/?rev=10749&view=rev Author: airwin Date: 2010-01-08 17:54:51 +0000 (Fri, 08 Jan 2010) Log Message: ----------- Keep Ada language support test branch(let) up to date with changes made in Ada language support in the PLplot core. Modified Paths: -------------- branches/test_cmake/test_ada/cmake_working/Modules/CMakeAdaInformation.cmake Modified: branches/test_cmake/test_ada/cmake_working/Modules/CMakeAdaInformation.cmake =================================================================== --- branches/test_cmake/test_ada/cmake_working/Modules/CMakeAdaInformation.cmake 2010-01-08 02:51:48 UTC (rev 10748) +++ branches/test_cmake/test_ada/cmake_working/Modules/CMakeAdaInformation.cmake 2010-01-08 17:54:51 UTC (rev 10749) @@ -21,18 +21,10 @@ INCLUDE(${CMAKE_USER_MAKE_RULES_OVERRIDE_Ada}) ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE_Ada) - -# for most systems a module is the same as a shared library -# so unless the variable CMAKE_MODULE_EXISTS is set just -# copy the values from the LIBRARY variables -IF(NOT CMAKE_MODULE_EXISTS) - SET(CMAKE_SHARED_MODULE_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_Ada_FLAGS}) - SET(CMAKE_SHARED_MODULE_CREATE_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_Ada_FLAGS}) -ENDIF(NOT CMAKE_MODULE_EXISTS) - # 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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ai...@us...> - 2012-09-07 16:21:08
|
Revision: 12230 http://plplot.svn.sourceforge.net/plplot/?rev=12230&view=rev Author: airwin Date: 2012-09-07 16:20:59 +0000 (Fri, 07 Sep 2012) Log Message: ----------- Update this complete test Ada library and example build using the latest Ada language support from the svn trunk version of PLplot. Fix cmake Ada support so it works correctly with cmake 2.8.9 release candidate 1. CMake support for position independent code has been altered and these changes reflect this. Use the environment variable ADAFLAGS rather than FFLAGS (?) to set Ada compiler flags. Modified Paths: -------------- branches/test_cmake/test_ada/cmake_working/Modules/CMakeAdaInformation.cmake Modified: branches/test_cmake/test_ada/cmake_working/Modules/CMakeAdaInformation.cmake =================================================================== --- branches/test_cmake/test_ada/cmake_working/Modules/CMakeAdaInformation.cmake 2012-09-07 16:14:11 UTC (rev 12229) +++ branches/test_cmake/test_ada/cmake_working/Modules/CMakeAdaInformation.cmake 2012-09-07 16:20:59 UTC (rev 12230) @@ -29,6 +29,18 @@ SET(CMAKE_SHARED_LIBRARY_CREATE_Ada_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS}) ENDIF(NOT CMAKE_SHARED_LIBRARY_CREATE_Ada_FLAGS) +IF(NOT CMAKE_Ada_COMPILE_OPTIONS_PIC) + SET(CMAKE_Ada_COMPILE_OPTIONS_PIC ${CMAKE_C_COMPILE_OPTIONS_PIC}) +ENDIF(NOT CMAKE_Ada_COMPILE_OPTIONS_PIC) + +IF(NOT CMAKE_Ada_COMPILE_OPTIONS_PIE) + SET(CMAKE_Ada_COMPILE_OPTIONS_PIE ${CMAKE_C_COMPILE_OPTIONS_PIE}) +ENDIF(NOT CMAKE_Ada_COMPILE_OPTIONS_PIE) + +IF(NOT CMAKE_Ada_COMPILE_OPTIONS_DLL) + SET(CMAKE_Ada_COMPILE_OPTIONS_DLL ${CMAKE_C_COMPILE_OPTIONS_DLL}) +ENDIF(NOT CMAKE_Ada_COMPILE_OPTIONS_DLL) + 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) @@ -97,7 +109,7 @@ 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}") +SET(CMAKE_Ada_FLAGS_INIT "$ENV{ADAFLAGS} ${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) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |