[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebindings/cmake/modules
From:       Helio Chissini de Castro <helio () kde ! org>
Date:       2008-07-02 20:01:20
Message-ID: 1215028880.126933.14591.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 827378 by helio:

Improving latest Allen patch. Kubuntu have cecil pkg-config files branded \
mono-cecil.pc and Mandriva have named as cecil.pc. Pointed by rdale and should fix \
Kubuntu installs with DESTDIR.


 M  +10 -2     CSharpMacros.cmake  


--- trunk/KDE/kdebindings/cmake/modules/CSharpMacros.cmake #827377:827378
@@ -95,12 +95,20 @@
 
 	IF(NOT WIN32)
 		INCLUDE(FindPkgConfig)
+		PKG_SEARCH_MODULE(MONO_CECIL mono-cecil)
+		if(MONO_CECIL_FOUND)
+			EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} mono-cecil \
--variable=assemblies_dir OUTPUT_VARIABLE GAC_ASSEMBLY_DIR \
OUTPUT_STRIP_TRAILING_WHITESPACE) +		endif(MONO_CECIL_FOUND)
+		
 		PKG_SEARCH_MODULE(CECIL cecil)
-                if(CECIL_FOUND)
+		if(CECIL_FOUND)
 			EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} cecil --variable=assemblies_dir \
OUTPUT_VARIABLE GAC_ASSEMBLY_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) \
+		endif(CECIL_FOUND) +
+		if(CECIL_FOUND OR MONO_CECIL_FOUND)
 			INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${GACUTIL_EXECUTABLE} -i \
${CS_LIBRARY_TARGET_DIR}/${target}.dll -package 2.0 -root \
${CMAKE_CURRENT_BINARY_DIR})")  INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mono/ \
                DESTINATION ${GAC_ASSEMBLY_DIR} )
-		endif(CECIL_FOUND)
+		endif(CECIL_FOUND OR MONO_CECIL_FOUND)
 	ELSE(NOT WIN32)
 		INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${GACUTIL_EXECUTABLE} -i \
${CS_LIBRARY_TARGET_DIR}/${target}.dll -package 2.0)")  ENDIF(NOT WIN32)


[prev in list] [next in list] [prev in thread] [next in thread]