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

BUG: fixes for hp

Browse Source
This commit is contained in:
Bill Hoffman 2003-03-11 15:25:50 -05:00
parent 729bc4cb6d
commit 0f19623edd
5 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/CTest/CMakeLists.txt
View File

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

9
Source/CursesDialog/form/fld_attr.c
View File

@ -29,8 +29,13 @@
/**************************************************************************** /****************************************************************************
* Author: Juergen Pfeifer <juergen.pfeifer@gmx.net> 1995,1997 * * Author: Juergen Pfeifer <juergen.pfeifer@gmx.net> 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$") MODULE_ID("$Id$")
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------

2
Source/cmDynamicLoader.cxx
View File

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

11
Tests/LoadCommand/CMakeLists.txt
View File

@ -22,10 +22,17 @@ CONFIGURE_FILE(${LoadedCommand_SOURCE_DIR}/LoadedCommand.h.in
INCLUDE_DIRECTORIES(${LoadedCommand_BINARY_DIR}) INCLUDE_DIRECTORIES(${LoadedCommand_BINARY_DIR})
# try to compile the command # 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_BINARY_DIR}/CMakeCommands
${LoadedCommand_SOURCE_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 the compile was OK, try loading the command
IF (COMPILE_OK) IF (COMPILE_OK)

11
Tests/LoadCommandOneConfig/CMakeLists.txt
View File

@ -22,10 +22,17 @@ CONFIGURE_FILE(${LoadedCommand_SOURCE_DIR}/LoadedCommand.h.in
INCLUDE_DIRECTORIES(${LoadedCommand_BINARY_DIR}) INCLUDE_DIRECTORIES(${LoadedCommand_BINARY_DIR})
# try to compile the command # 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_BINARY_DIR}/CMakeCommands
${LoadedCommand_SOURCE_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 the compile was OK, try loading the command
IF (COMPILE_OK) IF (COMPILE_OK)