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

List:       kde-commits
Subject:    KDE/kdebindings/cmake/modules
From:       Allen Winter <winter () kde ! org>
Date:       2008-07-02 15:47:55
Message-ID: 1215013675.781066.4006.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 827314 by winterz:

handle the case where cecil isn't found.
CCMAIL: helio@kde.org,Richard_Dale@tipitina.demon.co.uk


 M  +5 -3      CSharpMacros.cmake  


--- trunk/KDE/kdebindings/cmake/modules/CSharpMacros.cmake #827313:827314
@@ -96,9 +96,11 @@
 	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} ) +                if(CECIL_FOUND)
+			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} ) \
+		endif(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]