lcio
diff -u -r1.75 -r1.76
--- CMakeLists.txt 28 Jun 2010 14:59:17 -0000 1.75
+++ CMakeLists.txt 28 Jun 2010 15:07:39 -0000 1.76
@@ -188,13 +188,6 @@
COMMENT "Building lcio jar library..."
VERBATIM )
- # create custom target for cleaning class files
- #ADD_CUSTOM_TARGET( jar_clean
- # COMMAND ${SH} "${LCIO_ENV_INIT}" ant clean
- # WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
- # COMMENT "Cleaning java classes with ant clean..."
- # VERBATIM )
-
# tell make clean to also erase lcio.jar
# unfortunately ADDITIONAL_MAKE_CLEAN_FILES does not work with regexp, e.g. ${LCIO_JAVA_HEADERS_DIR}/event/*.java
SET_DIRECTORY_PROPERTIES( PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
@@ -385,10 +378,12 @@
ADD_CUSTOM_TARGET( uninstall
COMMAND "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_uninstall.cmake"
#COMMAND "${CMAKE_COMMAND}" -E remove "${LCIO_JAVA_HEADERS_DIR}/{io,event}/*.{java,class}"
+ #COMMAND "${CMAKE_COMMAND}" -E remove "${LCIO_JAVA_HEADERS_DIR}/io/*.class"
+ #COMMAND "${CMAKE_COMMAND}" -E remove "${LCIO_JAVA_HEADERS_DIR}/event/*.class"
COMMAND "${CMAKE_COMMAND}" -E remove "${LCIO_JAVA_HEADERS_DIR}/io/*.java"
- COMMAND "${CMAKE_COMMAND}" -E remove "${LCIO_JAVA_HEADERS_DIR}/io/*.class"
COMMAND "${CMAKE_COMMAND}" -E remove "${LCIO_JAVA_HEADERS_DIR}/event/*.java"
- COMMAND "${CMAKE_COMMAND}" -E remove "${LCIO_JAVA_HEADERS_DIR}/event/*.class"
+ COMMAND ${SH} "${LCIO_ENV_INIT}" ant clean
+ WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
)
# create configuration file from .in file