Changeset 7743 for trunk/projects/jar2lib

Timestamp:

08/31/11 10:34:02 (8 years ago)

Author:

hinerm

Message:

Improved control flow of platform specific installation

Previously, platform-specific installation was controlled
by three separate, specific if statements. After learning
that there can be fallthrough on some platforms with multiple
paths being executed, it was revised to an if-then-else pattern
which seems to be much cleaner in execution.

File:

• trunk/projects/jar2lib/src/main/resources/CMakeLists.vm (modified) (2 diffs)

trunk/projects/jar2lib/src/main/resources/CMakeLists.vm

@@ -332 +332 @@
 
 # ---HACK--- install(TARGETS ...) destroys linking on Linux but allows portability on OSX
-if(UNIX)
+
+if(APPLE)
+# install targets
+install(TARGETS
+  jtools
+  ${projectId}
+#foreach ($sourceFile in $sourceFiles)
+#set ($execName = $q.simpleName($sourceFile))
+  ${execName}
+#end##foreach $sourceFile
+  RUNTIME DESTINATION .
+  LIBRARY DESTINATION .
+  ARCHIVE DESTINATION .
+)
+elseif(WIN32 OR WIN64)
+# install targets
+install(TARGETS
+  jtools
+  ${projectId}
+#foreach ($sourceFile in $sourceFiles)
+#set ($execName = $q.simpleName($sourceFile))
+  ${execName}
+#end##foreach $sourceFile
+  RUNTIME DESTINATION .
+  LIBRARY DESTINATION .
+  ARCHIVE DESTINATION .
+)
+else(APPLE)
 install(FILES
   "${CMAKE_BINARY_DIR}/${Jar2Lib_DIST_DIR}/${J2L_LIB_PREFIX}jtools${J2L_SUFFIX}"
@@ -347 +374 @@
 )
 #end##foreach $sourceFile
-endif(UNIX)
-
-if(APPLE)
-# install targets
-install(TARGETS
-  jtools
-  ${projectId}
-#foreach ($sourceFile in $sourceFiles)
-#set ($execName = $q.simpleName($sourceFile))
-  ${execName}
-#end##foreach $sourceFile
-  RUNTIME DESTINATION .
-  LIBRARY DESTINATION .
-  ARCHIVE DESTINATION .
-)
 endif(APPLE)
 
-if(WIN32)
-# install targets
-install(TARGETS
-  jtools
-  ${projectId}
-#foreach ($sourceFile in $sourceFiles)
-#set ($execName = $q.simpleName($sourceFile))
-  ${execName}
-#end##foreach $sourceFile
-  RUNTIME DESTINATION .
-  LIBRARY DESTINATION .
-  ARCHIVE DESTINATION .
-)
-endif(WIN32)
 
 SET(CPACK_PACKAGE_FILE_NAME "${projectId}")