[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-01 1:28:14
Message-ID: 1214875694.654919.27416.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 826585 by helio:

- It took a few hours to find a solutionto allow the environment respect the gac dir \
and the environment from cmake install. A two step install solution was taken, \
allowing usage of standard install on second step. This solution fixes issues to \
packaging in some distros which was unable to do proper install withou some patching.


 M  +12 -2     CSharpMacros.cmake  


--- trunk/KDE/kdebindings/cmake/modules/CSharpMacros.cmake #826584:826585
@@ -15,6 +15,7 @@
 # after the target was added so you don't have to care about that.
 #
 # copyright (c) 2007 Arno Rehn arno@arnorehn.de
+# copyright (c) 2008 Helio castro helio@kde.org
 #
 # Redistribution and use is allowed according to the terms of the GPL license.
 
@@ -91,6 +92,15 @@
 
 MACRO(INSTALL_GAC target)
 	GET_CS_LIBRARY_TARGET_DIR()
-	
-	INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${GACUTIL_EXECUTABLE} -i \
${CS_LIBRARY_TARGET_DIR}/${target}.dll -package 2.0)") +
+	IF(NOT WIN32)
+		INCLUDE(FindPkgConfig)
+		PKG_SEARCH_MODULE(CECIL cecil)
+		EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} cecil --variable=assemblies_dir \
OUTPUT_VARIABLE GAC_ASSEMBLY_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) +		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} ) +	ELSE(NOT WIN32)
+		INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${GACUTIL_EXECUTABLE} -i \
${CS_LIBRARY_TARGET_DIR}/${target}.dll -package 2.0)") +	ENDIF(NOT WIN32)
+
 ENDMACRO(INSTALL_GAC target)


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