[Kde-bindings] KDE/kdebindings/cmake/modules

[Arno Rehn]

SVN commit 1062637 by arnorehn:

Fix some minor glitches. Don't send a fatal error if no c# compiler was found.

CCMAIL: kdedevel at etotheipiplusone.com
CCMAIL: kde-bindings at kde.org



 M  +1 -1      CMakeCSharpCompiler.cmake.in  
 M  +7 -3      CMakeDetermineCSharpCompiler.cmake  


--- trunk/KDE/kdebindings/cmake/modules/CMakeCSharpCompiler.cmake.in #1062636:1062637
@@ -1,5 +1,5 @@
 set(CMAKE_CSharp_COMPILER "@CMAKE_CSharp_COMPILER@")
-set(CMAKE_CSharp_COMPILER_LOADED 1)
+set(CMAKE_CSharp_COMPILER_LOADED @CMAKE_CSharp_COMPILER_LOADED@)
 set(GAC_DIR @GAC_DIR@)
 
 set(_csc_default_lib_path @_csc_default_lib_path@ CACHE INTERNAL "")
--- trunk/KDE/kdebindings/cmake/modules/CMakeDetermineCSharpCompiler.cmake #1062636:1062637
@@ -32,7 +32,7 @@
 
             # give up
             if (NOT CMAKE_CSharp_COMPILER)
-                message (SEND_ERROR "Couldn't find a valid C# compiler. Set either CMake_CSharp_COMPILER or the CSC environment variable to a valid path.")
+                message (STATUS "Couldn't find a valid C# compiler. Set either CMake_CSharp_COMPILER or the CSC environment variable to a valid path.")
             endif (NOT CMAKE_CSharp_COMPILER)
         endif (NOT CMAKE_CSharp_COMPILER)
     endif (NOT CMAKE_CSharp_COMPILER)
@@ -40,7 +40,7 @@
 endif(NOT CMAKE_CSharp_COMPILER)
 
 # now try to find the gac location
-if (CMAKE_CSharp_COMPILER AND NOT GAC_DIR AND NOT CSHARP_COMPILER_IS_CSC)
+if (CMAKE_CSharp_COMPILER AND NOT GAC_DIR AND MONO_FOUND)
     find_package(PkgConfig)
 
     if (PKG_CONFIG_FOUND)
@@ -67,7 +67,7 @@
         set (GAC_DIR "/usr/lib/mono")
         message(STATUS "Could not find cecil or mono. Using default GAC dir: ${GAC_DIR}")
     endif (NOT GAC_DIR)
-endif (CMAKE_CSharp_COMPILER AND NOT GAC_DIR AND NOT CSHARP_COMPILER_IS_CSC)
+endif (CMAKE_CSharp_COMPILER AND NOT GAC_DIR AND MONO_FOUND)
 
 # Create a cache entry so the user can modify this.
 set(GAC_DIR "${GAC_DIR}" CACHE PATH "Location of the GAC")
@@ -75,6 +75,10 @@
 
 mark_as_advanced(CMAKE_CSharp_COMPILER)
 
+if (CMAKE_CSharp_COMPILER)
+    set (CMAKE_CSharp_COMPILER_LOADED 1)
+endif (CMAKE_CSharp_COMPILER)
+
 # configure variables set in this file for fast reload later on
 configure_file(${CMAKE_SOURCE_DIR}/cmake/modules/CMakeCSharpCompiler.cmake.in 
   ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCSharpCompiler.cmake IMMEDIATE @ONLY)