kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Go back to using "." so the Java test passes on the nightly nmake dashboards again. Still need a solution that works with both nmake and Visual Studio builds.

Browse Source
This commit is contained in:
David Cole 2008-03-15 20:10:02 -04:00
parent d0670676d5
commit 6b31f40e40
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/CMakeJavaInformation.cmake
View File

@ -14,11 +14,11 @@ ENDIF(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX)
# this is a place holder if java needed flags for javac they would go here. # this is a place holder if java needed flags for javac they would go here.
IF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY) IF(NOT CMAKE_Java_CREATE_STATIC_LIBRARY)
IF(WIN32) # IF(WIN32)
SET(class_files_mask "*.class") # SET(class_files_mask "*.class")
ELSE(WIN32) # ELSE(WIN32)
SET(class_files_mask ".") SET(class_files_mask ".")
ENDIF(WIN32) # ENDIF(WIN32)
SET(CMAKE_Java_CREATE_STATIC_LIBRARY SET(CMAKE_Java_CREATE_STATIC_LIBRARY
"<CMAKE_Java_ARCHIVE> -cf <TARGET> -C <OBJECT_DIR> ${class_files_mask}") "<CMAKE_Java_ARCHIVE> -cf <TARGET> -C <OBJECT_DIR> ${class_files_mask}")