BUG: fixes for hp

Source/CTest/CMakeLists.txt

@@ -20,8 +20,12 @@ SET(CTEST_SRCS
     ../cmCTest.cxx
     cmCTestSubmit.cxx)
 
+MESSAGE( ${CMAKE_ROOT})
+GET_FILENAME_COMPONENT(CMAKE_DIR ${CMAKE_LIBRARY} PATH)
+
 INCLUDE_DIRECTORIES(${CTEST_SOURCE_DIR}/..
-	            ${CTEST_SOURCE_DIR}/Curl)
+	            ${CTEST_SOURCE_DIR}/Curl
+		    ${CMAKE_DIR})
 
 ADD_DEFINITIONS(-DHAVE_CURL)
 ADD_EXECUTABLE(ctest ${CTEST_SRCS})

Source/CursesDialog/form/fld_attr.c

@@ -29,8 +29,13 @@
 /****************************************************************************
  *   Author: Juergen Pfeifer <[email protected]> 1995,1997            *
  ****************************************************************************/
-#include "form.priv.h"
-
+#if defined(__hpux)
+ #define _XOPEN_SOURCE_EXTENDED
+#endif
+ #include "form.priv.h"
+#if defined(__hpux)
+  #undef _XOPEN_SOURCE_EXTENDED
+#endif
 MODULE_ID("$Id$")
 
 /*----------------------------------------------------------------------------
@@ -50,7 +55,7 @@ int set_field_ ## name (FIELD * field, chtype attr)\
            res = _nc_Synchronize_Attributes( field );\
          }\
        else\
-	 res = E_OK;\
+       res = E_OK;\
      }\
    RETURN(res);\
 }

Source/cmDynamicLoader.cxx

@@ -121,7 +121,7 @@ cmLibHandle cmDynamicLoader::OpenLibrary(const char* libname )
 
 int cmDynamicLoader::CloseLibrary(cmLibHandle lib)
 {
-  return 0;
+  return shl_unload(lib);
 }
 
 cmDynamicLoaderFunction

Tests/LoadCommand/CMakeLists.txt

@@ -22,10 +22,17 @@ CONFIGURE_FILE(${LoadedCommand_SOURCE_DIR}/LoadedCommand.h.in
 INCLUDE_DIRECTORIES(${LoadedCommand_BINARY_DIR})
 
 # try to compile the command
-TRY_COMPILE(COMPILE_OK 
+# make sure it is not already loaded
+IF(COMMAND CMAKE_TEST_COMMAND)
+ELSE(COMMAND CMAKE_TEST_COMMAND)
+  TRY_COMPILE(COMPILE_OK 
     ${LoadedCommand_BINARY_DIR}/CMakeCommands 
     ${LoadedCommand_SOURCE_DIR}/CMakeCommands 
-    CMAKE_LOADED_COMMANDS CMAKE_FLAGS -DMUDSLIDE_TYPE:STRING=MUCHO)
+    CMAKE_LOADED_COMMANDS CMAKE_FLAGS -DMUDSLIDE_TYPE:STRING=MUCHO
+    OUTPUT_VARIABLE OUTPUT )
+ENDIF(COMMAND CMAKE_TEST_COMMAND)
+
+MESSAGE("Output from try compile: ${OUTPUT}")
 
 # if the compile was OK, try loading the command
 IF (COMPILE_OK)

Tests/LoadCommandOneConfig/CMakeLists.txt

@@ -22,10 +22,17 @@ CONFIGURE_FILE(${LoadedCommand_SOURCE_DIR}/LoadedCommand.h.in
 INCLUDE_DIRECTORIES(${LoadedCommand_BINARY_DIR})
 
 # try to compile the command
-TRY_COMPILE(COMPILE_OK 
+# make sure it is not already loaded
+IF(COMMAND CMAKE_TEST_COMMAND)
+ELSE(COMMAND CMAKE_TEST_COMMAND)
+  TRY_COMPILE(COMPILE_OK 
     ${LoadedCommand_BINARY_DIR}/CMakeCommands 
     ${LoadedCommand_SOURCE_DIR}/CMakeCommands 
-    CMAKE_LOADED_COMMANDS CMAKE_FLAGS -DMUDSLIDE_TYPE:STRING=MUCHO)
+    CMAKE_LOADED_COMMANDS CMAKE_FLAGS -DMUDSLIDE_TYPE:STRING=MUCHO
+    OUTPUT_VARIABLE OUTPUT )
+ENDIF(COMMAND CMAKE_TEST_COMMAND)
+
+MESSAGE("Output from try compile: ${OUTPUT}")
 
 # if the compile was OK, try loading the command
 IF (COMPILE_OK)