Revision: 69972
http://sourceforge.net/p/brlcad/code/69972
Author: starseeker
Date: 2017-07-19 03:15:53 +0000 (Wed, 19 Jul 2017)
Log Message:
-----------
getting closer I think but still not 100% correct
Modified Paths:
--------------
brlcad/trunk/misc/CMake/FindTERMLIB.cmake
Modified: brlcad/trunk/misc/CMake/FindTERMLIB.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindTERMLIB.cmake 2017-07-18 21:02:19 UTC (rev
69971)
+++ brlcad/trunk/misc/CMake/FindTERMLIB.cmake 2017-07-19 03:15:53 UTC (rev
69972)
@@ -72,10 +72,10 @@
# include <term.h>
# endif
#endif
-int main () {
- char buffer[2048] = {0};
- (void)tgetent(buffer, \"vt100\");
- return 0;
+int main (void) {
+ char buffer[2048] = {0};
+ (void)tgetent(buffer, \"vt100\");
+ return 0;
}
")
@@ -85,33 +85,35 @@
if(HAVE_TERMLIB_${lname})
# Got lib, now sort through headers
foreach(hdr ${headers})
- string(TOUPPER "${hdr}" HDR)
- string(REGEX REPLACE "[^A-Z0-9]" "_" HDR "${HDR}")
- CHECK_INCLUDE_FILES(${hdr} HAVE_${HDR})
if(NOT TERMLIB_INCLUDE_DIR OR "${TERMLIB_INCLUDE_DIR}" MATCHES
"NOTFOUND")
+ message("${lname}: ${hdr}")
+ string(TOUPPER "${hdr}" HDR)
+ string(REGEX REPLACE "[^A-Z0-9]" "_" HDR "${HDR}")
+ CHECK_INCLUDE_FILES(${hdr} HAVE_${HDR})
find_path(TERMLIB_INCLUDE_DIR "${hdr}")
if(NOT "${TERMLIB_INCLUDE_DIR}" MATCHES "NOTFOUND")
- set(LIBTERM_RESULT)
+ set(LIBTERM_RESULT 1)
set(TERMLIB_LIBRARY "${lname}")
- file(WRITE "${CMAKE_BINARY_DIR}/CMakeTmp/termlib.c")
- set(CMAKE_REQUIRED_LIBRARIES_BAK ${CMAKE_REQUIRED_LIBRARIES})
- set(CMAKE_REQUIRED_LIBRARIES ${TERMLIB_LIBRARY})
- if(NOT LIBTERM_RESULT)
- try_run(LIBTERM_RESULT LIBTERM_COMPILE
+ file(WRITE "${CMAKE_BINARY_DIR}/CMakeTmp/termlib.c"
"${termlib_src}")
+ if(LIBTERM_RESULT)
+ try_run(LIBTERM_RESULT LIBTERM_COMPILE
"${CMAKE_BINARY_DIR}/CMakeTmp"
"${CMAKE_BINARY_DIR}/CMakeTmp/termlib.c"
COMPILE_DEFINITIONS "-DHAVE_${HDR}"
+ LINK_LIBRARIES "${lname}"
COMPILE_OUTPUT_VARIABLE CTERM_OUT
RUN_OUTPUT_VARIABLE RTERM_OUT)
- #message("CTERM: ${CTERM_OUT}")
- #message("RTERM: ${RTERM_OUT}")
- endif(NOT LIBTERM_RESULT)
- file(REMOVE "${CMAKE_BINARY_DIR}/CMakeTmp/termlib.c")
- if(NOT LIBTERM_RESULT)
+ message("CTERM: ${CTERM_OUT}")
+ message("RTERM: ${RTERM_OUT}")
+ message("LIBTERM_RESULT: ${LIBTERM_RESULT}")
+ endif(LIBTERM_RESULT)
+ #file(REMOVE "${CMAKE_BINARY_DIR}/CMakeTmp/termlib.c")
+ if(LIBTERM_RESULT)
set(TERMLIB_LIBRARY "NOTFOUND" CACHE STRING "TERMLIB" FORCE)
- else(NOT LIBTERM_RESULT)
- set(TERMLIB_LIBRARY ${TERMLIB_LIBRARY} CACHE STRING "TERMLIB"
FORCE)
- endif(NOT LIBTERM_RESULT)
- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_BAK})
+ set(TERMLIB_INCLUDE_DIR "NOTFOUND" CACHE STRING "TERMLIB" FORCE)
+ else(LIBTERM_RESULT)
+ set(TERMLIB_LIBRARY ${lname} CACHE STRING "TERMLIB" FORCE)
+ set(TERMLIB_INCLUDE_DIR "${TERMLIB_INCLUDE_DIR}" CACHE STRING
"TERMLIB" FORCE)
+ endif(LIBTERM_RESULT)
endif(NOT "${TERMLIB_INCLUDE_DIR}" MATCHES "NOTFOUND")
endif(NOT TERMLIB_INCLUDE_DIR OR "${TERMLIB_INCLUDE_DIR}" MATCHES
"NOTFOUND")
endforeach(hdr ${headers})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
