Menu
▾
▴
plplot-cvs
|
From: <ai...@us...> - 2013-06-28 20:21:58
|
Revision: 12395
http://sourceforge.net/p/plplot/code/12395
Author: airwin
Date: 2013-06-28 20:21:53 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
Use find_library to help find gphobos2 library.
Also take care of whitespace issues.
Modified Paths:
--------------
trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
Modified: trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
===================================================================
--- trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2013-06-28 09:59:51 UTC (rev 12394)
+++ trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2013-06-28 20:21:53 UTC (rev 12395)
@@ -25,17 +25,17 @@
"{return args.sizeof-1;}\n")
STRING(REGEX MATCH "dmd" DMDTEST "${CMAKE_D_COMPILER}")
IF(DMDTEST STREQUAL "dmd")
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- OUTPUT_VARIABLE OUTPUT)
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos2.a"
- OUTPUT_VARIABLE OUTPUT)
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ OUTPUT_VARIABLE OUTPUT)
+ ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos2.a"
+ OUTPUT_VARIABLE OUTPUT)
+ ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ELSE(DMDTEST STREQUAL "dmd")
- TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- OUTPUT_VARIABLE OUTPUT)
+ TRY_COMPILE(CMAKE_D_COMPILER_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ OUTPUT_VARIABLE OUTPUT)
ENDIF(DMDTEST STREQUAL "dmd")
SET(C_TEST_WAS_RUN 1)
ENDIF(NOT CMAKE_D_COMPILER_WORKS)
@@ -67,11 +67,11 @@
# FIXME. This is PLplot-specific location. Other projects will use
# a different location.
IF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
- CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in
- ${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake IMMEDIATE)
+ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in
+ ${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake IMMEDIATE)
ELSE(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
- CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in
- ${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake IMMEDIATE)
+ CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeDCompiler.cmake.in
+ ${CMAKE_PLATFORM_INFO_DIR}/CMakeDCompiler.cmake IMMEDIATE)
ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/language_support/cmake/CMakeDCompiler.cmake.in)
ENDIF(NOT CMAKE_D_COMPILER_WORKS)
@@ -82,25 +82,31 @@
"int main(char[][] args)\n"
"{ writefln(\"%s\", args[0]); return args.sizeof-1;}\n")
IF(CMAKE_COMPILER_IS_GDC)
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- #CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos"
- OUTPUT_VARIABLE OUTPUT)
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos2"
- OUTPUT_VARIABLE OUTPUT)
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ #CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos"
+ OUTPUT_VARIABLE OUTPUT)
+ ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ find_library(PHOBOS_LIBRARY gphobos2)
+ if(PHOBOS_LIBRARY)
+ TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ CMAKE_FLAGS "-DLINK_LIBRARIES=${PHOBOS_LIBRARY}"
+ OUTPUT_VARIABLE OUTPUT)
+ else(PHOBOS_LIBRARY)
+ message(STATUS "Failed to find Phobos library")
+ set(CMAKE_D_PHOBOS_WORKS OFF)
+ endif(PHOBOS_LIBRARY)
+ ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ELSE(CMAKE_COMPILER_IS_GDC)
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- OUTPUT_VARIABLE OUTPUT)
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos.a"
- COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import"
- OUTPUT_VARIABLE OUTPUT)
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ OUTPUT_VARIABLE OUTPUT)
+ ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos.a"
+ COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import"
+ OUTPUT_VARIABLE OUTPUT)
+ ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ENDIF(CMAKE_COMPILER_IS_GDC)
SET(C_TEST_WAS_RUN 1)
ENDIF(NOT CMAKE_D_PHOBOS_WORKS)
@@ -128,19 +134,19 @@
"int main(char[][] args)\n"
"{Stdout.newline();return args.sizeof-1;}\n")
IF(CMAKE_COMPILER_IS_GDC)
- TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=gtango"
- OUTPUT_VARIABLE OUTPUT)
+ TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ CMAKE_FLAGS "-DLINK_LIBRARIES=gtango"
+ OUTPUT_VARIABLE OUTPUT)
ELSE(CMAKE_COMPILER_IS_GDC)
- IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- OUTPUT_VARIABLE OUTPUT)
- ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libtango.a;${D_PATH}/lib/libphobos.a"
- COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import"
- OUTPUT_VARIABLE OUTPUT)
- ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ OUTPUT_VARIABLE OUTPUT)
+ ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+ TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libtango.a;${D_PATH}/lib/libphobos.a"
+ COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import"
+ OUTPUT_VARIABLE OUTPUT)
+ ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ENDIF(CMAKE_COMPILER_IS_GDC)
SET(C_TEST_WAS_RUN 1)
ENDIF(NOT CMAKE_D_TANGO_WORKS)
@@ -163,15 +169,15 @@
# if both tango and phobos are selected try to choose which one is available
IF(CMAKE_D_USE_TANGO AND CMAKE_D_USE_PHOBOS)
- MESSAGE(FATAL_ERROR "Tango AND Phobos selected, please choose one or the other!")
+ MESSAGE(FATAL_ERROR "Tango AND Phobos selected, please choose one or the other!")
ENDIF(CMAKE_D_USE_TANGO AND CMAKE_D_USE_PHOBOS)
# ensure the user has the appropriate std lib available
IF(CMAKE_D_USE_TANGO AND NOT CMAKE_D_TANGO_WORKS)
- MESSAGE(FATAL_ERROR "Tango is required for this project, but it is not available!")
+ MESSAGE(FATAL_ERROR "Tango is required for this project, but it is not available!")
ENDIF(CMAKE_D_USE_TANGO AND NOT CMAKE_D_TANGO_WORKS)
IF(CMAKE_D_USE_PHOBOS AND NOT CMAKE_D_PHOBOS_WORKS)
- MESSAGE(FATAL_ERROR "Phobos is required for this project, but it is not available!")
+ MESSAGE(FATAL_ERROR "Phobos is required for this project, but it is not available!")
ENDIF(CMAKE_D_USE_PHOBOS AND NOT CMAKE_D_PHOBOS_WORKS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-06-28 20:46:59
|
Revision: 12396
http://sourceforge.net/p/plplot/code/12396
Author: airwin
Date: 2013-06-28 20:46:53 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
Drop the find_library part of the previous commit. That turned out to
be required only because of a system installation screwup I had which
has since been fixed.
But retain the whitespace changes of the previous commit.
Modified Paths:
--------------
trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
Modified: trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake
===================================================================
--- trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2013-06-28 20:21:53 UTC (rev 12395)
+++ trunk/cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2013-06-28 20:46:53 UTC (rev 12396)
@@ -87,15 +87,9 @@
#CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos"
OUTPUT_VARIABLE OUTPUT)
ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- find_library(PHOBOS_LIBRARY gphobos2)
- if(PHOBOS_LIBRARY)
- TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
- CMAKE_FLAGS "-DLINK_LIBRARIES=${PHOBOS_LIBRARY}"
- OUTPUT_VARIABLE OUTPUT)
- else(PHOBOS_LIBRARY)
- message(STATUS "Failed to find Phobos library")
- set(CMAKE_D_PHOBOS_WORKS OFF)
- endif(PHOBOS_LIBRARY)
+ TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d
+ CMAKE_FLAGS "-DLINK_LIBRARIES=gphobos2"
+ OUTPUT_VARIABLE OUTPUT)
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
ELSE(CMAKE_COMPILER_IS_GDC)
IF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X