Feature #5240
closed
Added by Aurélien Larcher over 7 years ago.
Updated almost 7 years ago.
Description
Current version is 2.8.6.
I propose an update to 2.8.12.2 which is the latest minor from the 2.8 series.
Patches are already updated in my Github branch named 'cmake' and is working fine as far as I could test it, but some tests fail due to missing libraries at linking stage.
https://github.com/alarcher/oi-userland/tree/cmake
99% tests passed, 4 tests failed out of 311
Label Time Summary:
Label1 = 0.08 sec
Label2 = 0.08 sec
Total Test time (real) = 523.84 sec
The following tests FAILED:
25 - FindModulesExecuteAll (Failed)
223 - CMakeOnly.AllFindModules (Failed)
248 - RunCMake.VisibilityPreset (Failed)
302 - CMake.ProcessorCount (Failed)
Errors while running CTest
Files
- Status changed from New to Feedback
- % Done changed from 70 to 90
Aurelien:
I'm using cmake 2.8.12.2 to build scribus 1.5.0 and it seems to work well - even though I got the same 4 test errors (99% pass).
Nothing service impacting at the moment.
$ uname -a
SunOS testbot illumos-4e90188 i86pc i386 i86pc Solaris
$ cmake -version
cmake version 2.8.12.2
Index: cmake-3.0.2/Modules/ProcessorCount.cmake
===================================================================
--- cmake-3.0.2.orig/Modules/ProcessorCount.cmake
+++ cmake-3.0.2/Modules/ProcessorCount.cmake
@@ -169,6 +169,20 @@ function(ProcessorCount var)
endif()
endif()
+ if(NOT count)
+ # Sun prtconf
+ find_program(ProcessorCount_cmd_prtconf prtconf)
+ mark_as_advanced(ProcessorCount_cmd_prtconf)
+ if(ProcessorCount_cmd_prtconf)
+ execute_process(COMMAND ${ProcessorCount_cmd_prtconf}
+ ERROR_QUIET
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ OUTPUT_VARIABLE prtconf_output)
+ string(REGEX MATCHALL "cpu, *instance *#([0-9]+)" procs "${prtconf_output}")
+ list(LENGTH procs count)
+ endif()
+ endif()
+
# Execute this code when all previously attempted methods return empty
# output:
#
Or something like this.
- Status changed from Feedback to Resolved
- Assignee changed from Aurélien Larcher to Josef Sipek
- % Done changed from 90 to 100
Also available in: Atom
PDF