CMake: only compile if needed & more parallel compilation

adjustment to spring commit: a896bf9decc3f435b03534fd96a2f065e40dfa9e

Author: hoijui

CMakeLists.txt

@@ -49,15 +49,41 @@
 CreateClasspath(myJavaLibs ${myJLibDir})
 ConcatClasspaths(myClassPath "${CLASSPATH_Java_AIINTERFACE}" "${myJavaLibs}" ${myAiSourceDir} ${myLoaderSourceDir} ${JavaOO_AIWRAPPER_JAR_CLASSPATH})
 
-# Create a list of all the AIs source files
+# Create a list of all the AIs source files (for compiling)
 file(GLOB_RECURSE myLoaderSources RELATIVE "${myLoaderSourceDir}" FOLLOW_SYMLINKS "${myLoaderSourceDir}/*.java")
-file(GLOB_RECURSE myAiSources RELATIVE "${myAiSourceDir}" FOLLOW_SYMLINKS "${myAiSourceDir}/*.java")
+file(GLOB_RECURSE myAiSources RELATIVE "${myAiSourceDir}" FOLLOW_SYMLINKS "${myAiSourceDir}/*.java")
+# Create a list of all the AIs source files (for dependency tracking)
+file(GLOB_RECURSE myLoaderSourcesDep FOLLOW_SYMLINKS "${myLoaderSourceDir}/*.java")
+file(GLOB_RECURSE myAiSourcesDep FOLLOW_SYMLINKS "${myAiSourceDir}/*.java")
+
+# Assemble project generated libraries we depend on
+set(myDependTargets "${Java_AIINTERFACE_TARGET}" "${JavaOO_AIWRAPPER_TARGET}")
+set(myDependLibFiles "${Java_AIINTERFACE_JAR_BIN}" "${JavaOO_AIWRAPPER_JAR_BIN}")
+set_source_files_properties(${myDependLibFiles} PROPERTIES GENERATED TRUE)
+
+add_custom_target(${myLoaderTarget} SOURCES ${myBuildDir}/${myLoaderBinJarFile})
+set_source_files_properties(${myBuildDir}/${myLoaderBinJarFile} PROPERTIES GENERATED TRUE)
+add_dependencies(${myLoaderTarget} ${myDependTargets})
+
+add_custom_target(${myLoaderSourceTarget} SOURCES ${myBuildDir}/${myLoaderSrcJarFile})
+set_source_files_properties(${myBuildDir}/${myLoaderSrcJarFile} PROPERTIES GENERATED TRUE)
+
+add_custom_target(${myAiTarget} SOURCES ${myBuildDir}/${myAiBinJarFile})
+set_source_files_properties(${myBuildDir}/${myAiBinJarFile} PROPERTIES GENERATED TRUE)
+add_dependencies(${myAiTarget} ${myDependTargets})
+
+add_custom_target(${myAiSourceTarget} SOURCES ${myBuildDir}/${myAiSrcJarFile})
+set_source_files_properties(${myBuildDir}/${myAiSrcJarFile} PROPERTIES GENERATED TRUE)
+
+add_custom_target(${myTarget} ALL)
+add_dependencies(${myTarget} ${myLoaderTarget} ${myAiTarget} ${myLoaderSourceTarget} ${myAiSourceTarget})
 
 # Compile the loader library
-# needed by javac
-file(MAKE_DIRECTORY "${myJavaLoaderBuildDir}")
-add_custom_target(${myLoaderTarget} ALL
-#OUTPUT "${myBuildDir}/${myLoaderBinJarFile}"
+add_custom_command(
+OUTPUT
+"${myBuildDir}/${myLoaderBinJarFile}"
+COMMAND "${CMAKE_COMMAND}"
+"-E" "make_directory" "${myJavaLoaderBuildDir}"
 COMMAND "${JAVA_COMPILE}"
 "${JAVA_COMPILE_FLAG_CONDITIONAL}"
 "-cp" "${myClassPath}"
@@ -66,15 +92,21 @@
 COMMAND "${JAVA_ARCHIVE}"
 "cmf" "${myDir}/manifest.mf" "${myBuildDir}/${myLoaderBinJarFile}"
 "-C" "${myJavaLoaderBuildDir}" "${myJavaPkgFirstPart}"
-WORKING_DIRECTORY "${myLoaderSourceDir}"
-COMMENT " ${myTarget}: Creating library ${myLoaderBinJarFile}" VERBATIM)
-add_dependencies(${myLoaderTarget} ${Java_AIINTERFACE_TARGET} ${JavaOO_AIWRAPPER_TARGET})
-
-# Compile the ai library
-# needed by javac
-file(MAKE_DIRECTORY "${myJavaAiBuildDir}")
-add_custom_target(${myAiTarget} ALL
-#OUTPUT "${myBuildDir}/${myAiBinJarFile}"
+DEPENDS
+${myDependLibFiles}
+${myLoaderSourcesDep}
+WORKING_DIRECTORY
+"${myLoaderSourceDir}"
+COMMENT
+" ${myTarget}: Creating library ${myLoaderBinJarFile}" VERBATIM
+)
+
+# Compile the AI library
+add_custom_command(
+OUTPUT
+"${myBuildDir}/${myAiBinJarFile}"
+COMMAND "${CMAKE_COMMAND}"
+"-E" "make_directory" "${myJavaAiBuildDir}"
 COMMAND "${JAVA_COMPILE}"
 "${JAVA_COMPILE_FLAG_CONDITIONAL}"
 "-cp" "${myClassPath}"
@@ -83,46 +115,60 @@
 COMMAND "${JAVA_ARCHIVE}"
 "cmf" "${myDir}/manifest.mf" "${myBuildDir}/${myAiBinJarFile}"
 "-C" "${myJavaAiBuildDir}" "${myJavaPkgFirstPart}"
-WORKING_DIRECTORY "${myAiSourceDir}"
-COMMENT " ${myTarget}: Creating library ${myAiBinJarFile}" VERBATIM)
-add_dependencies(${myAiTarget} ${Java_AIINTERFACE_TARGET} ${JavaOO_AIWRAPPER_TARGET})
+DEPENDS
+${myDependLibFiles}
+${myAiSourcesDep}
+WORKING_DIRECTORY
+"${myAiSourceDir}"
+COMMENT
+" ${myTarget}: Creating library ${myAiBinJarFile}" VERBATIM
+)
 
-# Pack the sources
-add_custom_target(${myLoaderSourceTarget} ALL
-#OUTPUT "${myBuildDir}/${myLoaderSrcJarFile}"
+# Pack the loader sources
+add_custom_command(
+OUTPUT
+"${myBuildDir}/${myLoaderSrcJarFile}"
 COMMAND "${JAVA_ARCHIVE}"
 "cf" "${myBuildDir}/${myLoaderSrcJarFile}"
 "-C" "${myLoaderSourceDir}" "${myJavaPkgFirstPart}"
-WORKING_DIRECTORY "${myLoaderSourceDir}"
-COMMENT " ${myTarget}: Creating sources archive ${myLoaderSrcJarFile}" VERBATIM)
+DEPENDS
+${myLoaderSourcesDep}
+WORKING_DIRECTORY
+"${myLoaderSourceDir}"
+COMMENT
+" ${myTarget}: Creating sources archive ${myLoaderSrcJarFile}" VERBATIM
+)
 
-# Pack the sources
-add_custom_target(${myAiSourceTarget} ALL
-#OUTPUT "${myBuildDir}/${myAiSrcJarFile}"
+# Pack the AI sources
+add_custom_command(
+OUTPUT
+"${myBuildDir}/${myAiSrcJarFile}"
 COMMAND "${JAVA_ARCHIVE}"
 "cf" "${myBuildDir}/${myAiSrcJarFile}"
 "-C" "${myAiSourceDir}" "${myJavaPkgFirstPart}"
-WORKING_DIRECTORY "${myAiSourceDir}"
-COMMENT " ${myTarget}: Creating sources archive ${myAiSrcJarFile}" VERBATIM)
-
-add_custom_target(${myTarget} ALL)
-add_dependencies(${myTarget} ${myLoaderTarget} ${myAiTarget} ${myLoaderSourceTarget} ${myAiSourceTarget})
+DEPENDS
+${myAiSourcesDep}
+WORKING_DIRECTORY
+"${myAiSourceDir}"
+COMMENT
+" ${myTarget}: Creating sources archive ${myAiSrcJarFile}" VERBATIM
+)
 
 # Install the data files
-install(DIRECTORY "${myDir}/data/" DESTINATION ${myDataDir})
+install(DIRECTORY "${myDir}/data/"  DESTINATION ${myDataDir})
 # Install the library
 install (FILES "${myBuildDir}/${myLoaderBinJarFile}" DESTINATION ${myDataDir})
 # Install the library
-install (FILES "${myBuildDir}/${myAiBinJarFile}" DESTINATION ${myDataDir})
+install (FILES "${myBuildDir}/${myAiBinJarFile}"  DESTINATION ${myDataDir})
 # Install the sources archive
 install (FILES "${myBuildDir}/${myLoaderSrcJarFile}" DESTINATION ${myDataDir}/jlib)
 # Install the sources archive
-install (FILES "${myBuildDir}/${myAiSrcJarFile}" DESTINATION ${myDataDir}/jlib)
+install (FILES "${myBuildDir}/${myAiSrcJarFile}"  DESTINATION ${myDataDir}/jlib)
 # Install the Java OO Wrapper libraries
-install(FILES "${JavaOO_AIWRAPPER_JAR_BIN}" DESTINATION ${myDataDir}/jlib)
+install(FILES "${JavaOO_AIWRAPPER_JAR_BIN}"  DESTINATION ${myDataDir}/jlib)
 set(wrapperJLibDir "${CMAKE_SOURCE_DIR}/AI/Wrappers/JavaOO/jlib")
 if (EXISTS ${wrapperJLibDir})
-install(DIRECTORY "${wrapperJLibDir}/" DESTINATION ${myDataDir}/jlib)
+install(DIRECTORY "${wrapperJLibDir}/"  DESTINATION ${myDataDir}/jlib)
 endif (EXISTS ${wrapperJLibDir})
 endif (BUILD_THIS_SKIRMISHAI)