Thread: [brlcad-commits] SF.net SVN: brlcad:[45969] brlcad/trunk/CMakeLists.txt (Page 3)
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <sta...@us...> - 2011-08-13 06:57:32
|
Revision: 45969 http://brlcad.svn.sourceforge.net/brlcad/?rev=45969&view=rev Author: starseeker Date: 2011-08-13 06:57:24 +0000 (Sat, 13 Aug 2011) Log Message: ----------- Mark rtgl as advanced. Starting to look fairly clean now, at least on Linux. Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-13 06:54:39 UTC (rev 45968) +++ brlcad/trunk/CMakeLists.txt 2011-08-13 06:57:24 UTC (rev 45969) @@ -652,6 +652,7 @@ # Enable RTGL. Requires an enabled OpenGL. OPTION(BRLCAD-ENABLE_RTGL "Enable experimental RTGL code." OFF) +MARK_AS_ADVANCED(BRLCAD-ENABLE_RTGL) IF(NOT BRLCAD-ENABLE_OPENGL AND BRLCAD-ENABLE_RTGL) MESSAGE("RTGL requested, but OpenGL is not enabled - disabling") SET(BRLCAD-ENABLE_RTGL OFF CACHE BOOL "Enable experimental RTGL code." FORCE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-08-19 21:05:02
|
Revision: 46291 http://brlcad.svn.sourceforge.net/brlcad/?rev=46291&view=rev Author: starseeker Date: 2011-08-19 21:04:55 +0000 (Fri, 19 Aug 2011) Log Message: ----------- Can't configure for 64bit then 32bit, all the find_library and find_package results are for the wrong arch. Hault configure and inform the user what needs to be done. Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-19 20:37:40 UTC (rev 46290) +++ brlcad/trunk/CMakeLists.txt 2011-08-19 21:04:55 UTC (rev 46291) @@ -278,7 +278,6 @@ endfunction(add_subdirectory) ENDIF(NOT BRLCAD-IS_SUBBUILD) - #--------------------------------------------------------------------- # CMake derives much of its functionality from modules, typically # stored in one directory - let CMake know where to find them. @@ -826,10 +825,17 @@ ENDIF(CMAKE_CL_64) ENDIF(MSVC) -IF(${CMAKE_CPU_TYPE} STREQUAL "32BIT") - set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF) -ENDIF(${CMAKE_CPU_TYPE} STREQUAL "32BIT") +# One of the problems with 32/64 building is we need to search anew +# for 64 bit libs after a 32 bit configure, or vice versa. +IF(PREVIOUS_CONFIGURE_TYPE) + IF(NOT ${PREVIOUS_CONFIGURE_TYPE} STREQUAL ${CMAKE_CPU_TYPE}) + MESSAGE(FATAL_ERROR "Configuring for ${CMAKE_CPU_TYPE} build, but previous configuration for ${PREVIOUS_CONFIGURE_TYPE} is already present. To proceed, either clear CMakeCache.txt file or specify ${PREVIOUS_CONFIGURE_TYPE} as the build type.") + ENDIF(NOT ${PREVIOUS_CONFIGURE_TYPE} STREQUAL ${CMAKE_CPU_TYPE}) +ENDIF(PREVIOUS_CONFIGURE_TYPE) +SET(PREVIOUS_CONFIGURE_TYPE ${CMAKE_CPU_TYPE} CACHE STRING "Previous configuration CPU type" FORCE) +MARK_AS_ADVANCED(PREVIOUS_CONFIGURE_TYPE) + # ******************************************************************* # *** Check for Programs - Stage 2 of 9 *** # ******************************************************************* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_r...@us...> - 2011-08-23 07:25:14
|
Revision: 46323 http://brlcad.svn.sourceforge.net/brlcad/?rev=46323&view=rev Author: d_rossberg Date: 2011-08-23 07:25:07 +0000 (Tue, 23 Aug 2011) Log Message: ----------- quell cmake warning and apparently trimmed trailing spaces Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-23 05:57:57 UTC (rev 46322) +++ brlcad/trunk/CMakeLists.txt 2011-08-23 07:25:07 UTC (rev 46323) @@ -569,8 +569,8 @@ OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON) MARK_AS_ADVANCED(BUILD_SHARED_LIBS) -# Build static libs by default unless we're debugging. Note: this -# option will not disable libraries specifically added as STATIC even +# Build static libs by default unless we're debugging. Note: this +# option will not disable libraries specifically added as STATIC even # when OFF. AUTO_OPTION(BRLCAD_BUILD_STATIC BUILD_STATIC_LIBS "OFF" "ON") @@ -821,17 +821,17 @@ MESSAGE(WARNING "Selected MSVC compiler is 32 bit - setting cpu type to 32 bit. To perform a 64 bit MSVC build, select the 64 bit MSVC CMake generator.") SET(BRLCAD-CPU_TYPE "32BIT" CACHE STRING "Detect system CPU type." FORCE) ENDIF(NOT "${BRLCAD-CPU_TYPE}" STREQUAL "AUTO") - ENDIF(NOT ${BRLCAD-CPU_TYPE} STREQUAL "32BIT") + ENDIF(NOT ${CMAKE_CPU_TYPE} STREQUAL "32BIT") ENDIF(CMAKE_CL_64) ENDIF(MSVC) # One of the problems with 32/64 building is we need to search anew # for 64 bit libs after a 32 bit configure, or vice versa. -IF(PREVIOUS_CONFIGURE_TYPE) +IF(PREVIOUS_CONFIGURE_TYPE) IF(NOT ${PREVIOUS_CONFIGURE_TYPE} STREQUAL ${CMAKE_CPU_TYPE}) MESSAGE(FATAL_ERROR "Configuring for ${CMAKE_CPU_TYPE} build, but previous configuration for ${PREVIOUS_CONFIGURE_TYPE} is already present. To proceed, either clear CMakeCache.txt file or specify ${PREVIOUS_CONFIGURE_TYPE} as the build type.") ENDIF(NOT ${PREVIOUS_CONFIGURE_TYPE} STREQUAL ${CMAKE_CPU_TYPE}) -ENDIF(PREVIOUS_CONFIGURE_TYPE) +ENDIF(PREVIOUS_CONFIGURE_TYPE) SET(PREVIOUS_CONFIGURE_TYPE ${CMAKE_CPU_TYPE} CACHE STRING "Previous configuration CPU type" FORCE) MARK_AS_ADVANCED(PREVIOUS_CONFIGURE_TYPE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abh...@us...> - 2011-08-23 16:40:44
|
Revision: 46345 http://brlcad.svn.sourceforge.net/brlcad/?rev=46345&view=rev Author: abhi2011 Date: 2011-08-23 16:40:38 +0000 (Tue, 23 Aug 2011) Log Message: ----------- Added detection of bullet dynamic libraries using the stock CMAKE FindCMake.cmake module Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-23 16:30:42 UTC (rev 46344) +++ brlcad/trunk/CMakeLists.txt 2011-08-23 16:40:38 UTC (rev 46345) @@ -1003,6 +1003,12 @@ # IRIX libgen library BRLCAD_CHECK_LIBRARY(GEN gen basename) +# Bullet physics library +FIND_PACKAGE(Bullet) +IF(BULLET_FOUND) + FILE(APPEND ${CONFIG_H_FILE} "#define HAVE_BULLET 1\n") +ENDIF(BULLET_FOUND) + # ******************************************************************* # *** Check for Headers - Stage 5 of 9 *** # ******************************************************************* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-08-24 00:29:08
|
Revision: 46364 http://brlcad.svn.sourceforge.net/brlcad/?rev=46364&view=rev Author: starseeker Date: 2011-08-24 00:29:02 +0000 (Wed, 24 Aug 2011) Log Message: ----------- Since it's proving convenient to make a build directory in the src dir for a cmake .. build, ignore the two most common cases when doing cpack Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-23 23:23:55 UTC (rev 46363) +++ brlcad/trunk/CMakeLists.txt 2011-08-24 00:29:02 UTC (rev 46364) @@ -1617,7 +1617,7 @@ SET(CPACK_SOURCE_GENERATOR TGZ TBZ2 ZIP) SET(CPACK_SOURCE_PACKAGE_FILE_NAME "brlcad-${BRLCAD_VERSION}") - SET(CPACK_SOURCE_IGNORE_FILES "\\\\.svn/") + SET(CPACK_SOURCE_IGNORE_FILES "\\\\.svn/" "build/" "brlcad-build/") CONFIGURE_FILE("${BRLCAD_CMAKE_DIR}/BRLCAD_CPackOptions.cmake.in" "${CMAKE_BINARY_DIR}/BRLCAD_CPackOptions.cmake" @ONLY) SET(CPACK_PROJECT_CONFIG_FILE "${CMAKE_BINARY_DIR}/BRLCAD_CPackOptions.cmake") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-08-25 01:09:04
|
Revision: 46393 http://brlcad.svn.sourceforge.net/brlcad/?rev=46393&view=rev Author: starseeker Date: 2011-08-25 01:08:57 +0000 (Thu, 25 Aug 2011) Log Message: ----------- mark BULLET_INCLUDE_DIR as advanced Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-25 01:06:20 UTC (rev 46392) +++ brlcad/trunk/CMakeLists.txt 2011-08-25 01:08:57 UTC (rev 46393) @@ -1015,6 +1015,7 @@ IF(BULLET_FOUND) FILE(APPEND ${CONFIG_H_FILE} "#define HAVE_BULLET 1\n") ENDIF(BULLET_FOUND) +MARK_AS_ADVANCED(BULLET_INCLUDE_DIR) # ******************************************************************* # *** Check for Headers - Stage 5 of 9 *** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-08-25 16:12:38
|
Revision: 46406 http://brlcad.svn.sourceforge.net/brlcad/?rev=46406&view=rev Author: starseeker Date: 2011-08-25 16:12:31 +0000 (Thu, 25 Aug 2011) Log Message: ----------- don't want recursive behavior, so spot .. and ignore it in distcheck path handling. Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-25 16:09:35 UTC (rev 46405) +++ brlcad/trunk/CMakeLists.txt 2011-08-25 16:12:31 UTC (rev 46406) @@ -212,7 +212,9 @@ WHILE(ITEM_PATH) get_filename_component(ITEM_NAME ${ITEM_PATH} NAME) get_filename_component(ITEM_PATH ${ITEM_PATH} PATH) - FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${targetdir}/${ITEM_PATH}/cmakepaths.cmake "${ITEM_NAME}\n") + IF(NOT ${ITEM_NAME} MATCHES "\\.\\.") + FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${targetdir}/${ITEM_PATH}/cmakepaths.cmake "${ITEM_NAME}\n") + ENDIF(NOT ${ITEM_NAME} MATCHES "\\.\\.") ENDWHILE(ITEM_PATH) ENDIF(NOT ${ITEM_PATH} MATCHES "^${ITEM_ABS_PATH}$") ELSE(ITEM_PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-08-25 20:00:26
|
Revision: 46410 http://brlcad.svn.sourceforge.net/brlcad/?rev=46410&view=rev Author: starseeker Date: 2011-08-25 20:00:20 +0000 (Thu, 25 Aug 2011) Log Message: ----------- These variables are not needed by default, but useful in some situations - put commented out lines in to illustrate how they would be set Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-25 19:02:31 UTC (rev 46409) +++ brlcad/trunk/CMakeLists.txt 2011-08-25 20:00:20 UTC (rev 46410) @@ -1602,6 +1602,8 @@ SET(CPACK_GENERATOR ${CPACK_GENERATOR} RPM) SET(CPACK_RPM_PACKAGE_LICENSE "LGPL 2.1") SET(CPACK_RPM_PACKAGE_GROUP "Applications/Engineering") + #SET(CPACK_RPM_PACKAGE_NAME "brlcad_${BRLCAD_MAJOR_VERSION}_${BRLCAD_MINOR_VERSION}_${BRLCAD_PATCH_VERSION}") + #SET(CPACK_RPM_PACKAGE_RELEASE 2) ENDIF(RPMBUILD_EXEC) IF(${CMAKE_CPU_TYPE} STREQUAL "32BIT" AND ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") SET(CPACK_PACKAGE_FILE_NAME "BRL-CAD_${BRLCAD_VERSION}_${CMAKE_SYSTEM_NAME}_x86") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-08-26 03:42:56
|
Revision: 46434 http://brlcad.svn.sourceforge.net/brlcad/?rev=46434&view=rev Author: starseeker Date: 2011-08-26 03:42:50 +0000 (Fri, 26 Aug 2011) Log Message: ----------- Fix comment - we aren't interested in setting for debug on Windows at the moment - usual pattern there is to run from build directory and then create the .exe installer Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-26 02:18:39 UTC (rev 46433) +++ brlcad/trunk/CMakeLists.txt 2011-08-26 03:42:50 UTC (rev 46434) @@ -388,9 +388,9 @@ ENDIF(CMAKE_BUILD_TYPE MATCHES "NONE") #--------------------------------------------------------------------- -# The location in which to install BRLCAD. Need a good Debug location -# for Windows. Only do this if CMAKE_INSTALL_PREFIX hasn't been set -# already, to try and allow parent builds (if any) some control. +# The location in which to install BRLCAD. Only do this if +# CMAKE_INSTALL_PREFIX hasn't been set already, to try and allow +# parent builds (if any) some control. IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR NOT CMAKE_INSTALL_PREFIX) IF(NOT WIN32) IF ("${CMAKE_BUILD_TYPE}" MATCHES "Release") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-08-30 02:57:05
|
Revision: 46460 http://brlcad.svn.sourceforge.net/brlcad/?rev=46460&view=rev Author: brlcad Date: 2011-08-30 02:56:58 +0000 (Tue, 30 Aug 2011) Log Message: ----------- might help to actually test for size_t :) Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-29 23:11:28 UTC (rev 46459) +++ brlcad/trunk/CMakeLists.txt 2011-08-30 02:56:58 UTC (rev 46460) @@ -1145,8 +1145,8 @@ BRLCAD_TYPE_SIZE("int" INT "") BRLCAD_TYPE_SIZE("long" LONG "") BRLCAD_TYPE_SIZE("long long" LONG_LONG "") +BRLCAD_TYPE_SIZE("size_t" SIZE "") BRLCAD_TYPE_SIZE("ssize_t" SSIZE "") -BRLCAD_TYPE_SIZE("ssize_t" SSIZE "") BRLCAD_TYPE_SIZE("uint64_t" UINT64 "") BRLCAD_TYPE_SIZE("uintptr_t" UINTPTR "") BRLCAD_TYPE_SIZE("sig_t" SIG "signal.h") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-08-30 03:18:25
|
Revision: 46463 http://brlcad.svn.sourceforge.net/brlcad/?rev=46463&view=rev Author: brlcad Date: 2011-08-30 03:18:18 +0000 (Tue, 30 Aug 2011) Log Message: ----------- arguable whether testing libc supports %z as a print width specifier is a compiler characteristic or type testing but go with the latter. add the (new and untested) BRLCAD_CHECK_C99_FORMAT_SPECIFIERS macro so we can toggle code logic based on HAVE_C99_FORMAT_SPECIFIERS Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-30 03:13:36 UTC (rev 46462) +++ brlcad/trunk/CMakeLists.txt 2011-08-30 03:18:18 UTC (rev 46463) @@ -900,7 +900,6 @@ #CHECK_C_COMPILER_FLAG("Wl,--no-undefined" NO_UNDEFINED_LINKER_FLAG) - # ******************************************************************* # *** Check for Libraries - Stage 4 of 9 *** # ******************************************************************* @@ -1027,6 +1026,7 @@ ENDIF(BULLET_FOUND) MARK_AS_ADVANCED(BULLET_INCLUDE_DIR) + # ******************************************************************* # *** Check for Headers - Stage 5 of 9 *** # ******************************************************************* @@ -1128,6 +1128,7 @@ BRLCAD_CHECK_BASENAME() BRLCAD_CHECK_DIRNAME() + # ******************************************************************* # *** Check for Types/Structures - Stage 6 of 9 *** # ******************************************************************* @@ -1151,6 +1152,10 @@ BRLCAD_TYPE_SIZE("uintptr_t" UINTPTR "") BRLCAD_TYPE_SIZE("sig_t" SIG "signal.h") +# see if the compiler supports %z as a size_t print width specifier +BRLCAD_CHECK_C99_FORMAT_SPECIFIERS() + + # ******************************************************************* # *** Check for Functions - Stage 7 of 9 *** # ******************************************************************* @@ -1197,6 +1202,7 @@ BRLCAD_FUNCTION_EXISTS(vfork HAVE_VFORK) BRLCAD_FUNCTION_EXISTS(writev HAVE_WRITEV) + # ******************************************************************* # *** Check for System Services - Stage 8 of 9 *** # ******************************************************************* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-08-30 04:34:44
|
Revision: 46471 http://brlcad.svn.sourceforge.net/brlcad/?rev=46471&view=rev Author: starseeker Date: 2011-08-30 04:34:37 +0000 (Tue, 30 Aug 2011) Log Message: ----------- Hmm... it might be that platforms with multiple CFG types shouldn't share the same output directories... try this. Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-30 04:20:19 UTC (rev 46470) +++ brlcad/trunk/CMakeLists.txt 2011-08-30 04:34:37 UTC (rev 46471) @@ -459,16 +459,16 @@ STRING(TOUPPER "${CFG_TYPE}" CFG_TYPE) IF(NOT "CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE}") IF(WIN32) - SET("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/bin CACHE INTERNAL "Single output directory for building all libraries.") + SET("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/${CFG_TYPE}/bin CACHE INTERNAL "Single output directory for building ${CFG_TYPE} libraries.") ELSE(WIN32) - SET("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/lib CACHE INTERNAL "Single output directory for building all libraries.") + SET("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/${CFG_TYPE}/lib CACHE INTERNAL "Single output directory for building ${CFG_TYPE} libraries.") ENDIF(WIN32) ENDIF(NOT "CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE}") IF(NOT "CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE}") - SET("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/lib CACHE INTERNAL "Single output directory for building all archives.") + SET("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/${CFG_TYPE}/lib CACHE INTERNAL "Single output directory for building ${CFG_TYPE} archives.") ENDIF(NOT "CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE}") IF(NOT "CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE}") - SET("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/bin CACHE INTERNAL "Single output directory for building all executables.") + SET("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/${CFG_TYPE}/bin CACHE INTERNAL "Single output directory for building ${CFG_TYPE} executables.") ENDIF(NOT "CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE}") ENDFOREACH() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-08-30 04:38:12
|
Revision: 46472 http://brlcad.svn.sourceforge.net/brlcad/?rev=46472&view=rev Author: brlcad Date: 2011-08-30 04:38:06 +0000 (Tue, 30 Aug 2011) Log Message: ----------- checking order changed. update docs. need to check compiler characteristics earlier within cmake so that flags are set properly. remember there was a specific reason for delaying the compiler testing until after headers/libs/types with the autotools build but don't remember what that reason was any longer (and it's not documented) so go with the flow -- makes more sense to test the compiler flags earlier anyways. Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-30 04:34:37 UTC (rev 46471) +++ brlcad/trunk/CMakeLists.txt 2011-08-30 04:38:06 UTC (rev 46472) @@ -55,10 +55,10 @@ # 0) information on the package and toplevel CMake settings # 1) define top level options # 2) check programs -# 3) check libraries -# 4) check headers -# 5) check types/structures -# 6) check compiler characteristics +# 3) check compiler characteristics +# 4) check libraries +# 5) check headers +# 6) check types/structures # 7) check functions # 8) check system services # 9) output a summary @@ -874,7 +874,7 @@ # ******************************************************************* -# *** Check for Compile Characteristics - Stage 3 of 9 *** +# *** Check for Compiler Characteristics - Stage 3 of 9 *** # ******************************************************************* INCLUDE(${BRLCAD_CMAKE_DIR}/CompilerFlags.cmake) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-08-30 04:42:16
|
Revision: 46473 http://brlcad.svn.sourceforge.net/brlcad/?rev=46473&view=rev Author: starseeker Date: 2011-08-30 04:42:10 +0000 (Tue, 30 Aug 2011) Log Message: ----------- typo, wording tweak Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-30 04:38:06 UTC (rev 46472) +++ brlcad/trunk/CMakeLists.txt 2011-08-30 04:42:10 UTC (rev 46473) @@ -45,12 +45,11 @@ # *** BRL-CAD's CMakeLists.txt *** # ******************************************************************* # -# This file define the toplevel CMake build logic for BRL-CAD. +# This file defines the toplevel CMake build logic for BRL-CAD. # As best as is reasonably possible, proper ordering and # separation of tests and settings should be maintained per the # recommended standard layout. The tests should be added to the -# rather clearly labeled sections below so that they are as -# follows: +# labeled sections below so that they are organized as follows: # # 0) information on the package and toplevel CMake settings # 1) define top level options This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-08-30 04:47:57
|
Revision: 46474 http://brlcad.svn.sourceforge.net/brlcad/?rev=46474&view=rev Author: starseeker Date: 2011-08-30 04:47:50 +0000 (Tue, 30 Aug 2011) Log Message: ----------- more rewording Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-30 04:42:10 UTC (rev 46473) +++ brlcad/trunk/CMakeLists.txt 2011-08-30 04:47:50 UTC (rev 46474) @@ -183,12 +183,13 @@ # of the parent build as well, and disables the mechanism for ensuring # that the timing code runs at the correct points during the build. -# Also in this logic, we need to provide bookkeeping logic for the -# distribution verification or "distcheck" routines that will check -# the state of the source tree against that expected and accounted -# for in the build files. The global coverage needed for the purpose -# results in the command override mechanism needed for target ordering -# needing to serve two purposes at once. +# We also need to provide bookkeeping logic here for the distribution +# verification or "distcheck" routines that will validate the state +# of the source tree against that expected and accounted for in the +# build files. The global coverage needed for the purpose results in +# the add_library/add_executable command override mechanism having +# to serve two purposes at once; since we only override these functions +# once the logic for both jobs is intertwined below. # First, define a macro for building lists of files. Distcheck needs # to know what files are "supposed" to be present in order to make This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-08-30 04:50:50
|
Revision: 46475 http://brlcad.svn.sourceforge.net/brlcad/?rev=46475&view=rev Author: starseeker Date: 2011-08-30 04:50:43 +0000 (Tue, 30 Aug 2011) Log Message: ----------- I suppose the date/timestamp code failing to generate a date should be fatal - that has to be fixed if it breaks. Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-30 04:47:50 UTC (rev 46474) +++ brlcad/trunk/CMakeLists.txt 2011-08-30 04:50:43 UTC (rev 46475) @@ -357,7 +357,7 @@ FILE(READ ${CONFIG_TIMESTAMP_FILE} CONFIG_TS) STRING(STRIP ${CONFIG_TS} CONFIG_TS) ELSE(TIME_RESULT MATCHES "^0$") - MESSAGE(ERROR "Code to determine current date and time failed!\n") + MESSAGE(FATAL_ERROR "Code to determine current date and time failed!\n") ENDIF(TIME_RESULT MATCHES "^0$") #--------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-08-30 05:03:18
|
Revision: 46476 http://brlcad.svn.sourceforge.net/brlcad/?rev=46476&view=rev Author: starseeker Date: 2011-08-30 05:03:12 +0000 (Tue, 30 Aug 2011) Log Message: ----------- don't need the math expression anymore Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-30 04:50:43 UTC (rev 46475) +++ brlcad/trunk/CMakeLists.txt 2011-08-30 05:03:12 UTC (rev 46476) @@ -791,7 +791,6 @@ MESSAGE(WARNING "CMAKE_SIZEOF_VOID_P is not defined - assuming 32 bit platform") SET(CMAKE_SIZEOF_VOID_P 4) ENDIF(NOT CMAKE_SIZEOF_VOID_P) -math(EXPR platform_bit_type "${CMAKE_SIZEOF_VOID_P} * 8") IF(${BRLCAD-CPU_TYPE} STREQUAL "AUTO") IF(${CMAKE_SIZEOF_VOID_P} MATCHES "^8$") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-08-31 01:28:04
|
Revision: 46495 http://brlcad.svn.sourceforge.net/brlcad/?rev=46495&view=rev Author: starseeker Date: 2011-08-31 01:27:57 +0000 (Wed, 31 Aug 2011) Log Message: ----------- Explain the DEBUG header definition a little more thoroughly. Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-31 01:19:35 UTC (rev 46494) +++ brlcad/trunk/CMakeLists.txt 2011-08-31 01:27:57 UTC (rev 46495) @@ -551,6 +551,10 @@ FILE(APPEND ${CONFIG_H_FILE} "#define PACKAGE_VERSION \"${BRLCAD_VERSION}\"\n") FILE(APPEND ${CONFIG_H_FILE} "#define VERSION \"${BRLCAD_VERSION}\"\n") +# A variety of debugging messages in the code key off of the DEBUG +# definition - unlike the build flags, this is turned on and off based +# on the build type. A "Release" build with debugging compiler flags +# will still not print debugging messages conditionalized on DEBUG. IF("${CMAKE_BUILD_TYPE}" MATCHES "Debug") FILE(APPEND ${CONFIG_H_FILE} "#define DEBUG 1\n") ENDIF("${CMAKE_BUILD_TYPE}" MATCHES "Debug") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-08-31 20:08:25
|
Revision: 46509 http://brlcad.svn.sourceforge.net/brlcad/?rev=46509&view=rev Author: starseeker Date: 2011-08-31 20:08:18 +0000 (Wed, 31 Aug 2011) Log Message: ----------- X11 is an advanced option under Windows, mark it as such. Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-08-31 19:45:07 UTC (rev 46508) +++ brlcad/trunk/CMakeLists.txt 2011-08-31 20:08:18 UTC (rev 46509) @@ -619,6 +619,7 @@ # Enable features requiring X11 IF(WIN32) OPTION(BRLCAD-ENABLE_X11 "Use X11." OFF) + MARK_AS_ADVANCED(BRLCAD-ENABLE_X11) ELSEIF(BRLCAD-ENABLE_AQUA) OPTION(BRLCAD-ENABLE_X11 "Use X11." OFF) ELSE(WIN32) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2011-09-01 19:06:00
|
Revision: 46540 http://brlcad.svn.sourceforge.net/brlcad/?rev=46540&view=rev Author: brlcad Date: 2011-09-01 19:05:53 +0000 (Thu, 01 Sep 2011) Log Message: ----------- distinguish compilation of 3rd party sources from our own build settings with different labels. Use 'Compile' instead of 'Build' since that helps disambiguate what the ON/OFF means (i.e., action not feature). Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-09-01 17:21:56 UTC (rev 46539) +++ brlcad/trunk/CMakeLists.txt 2011-09-01 19:05:53 UTC (rev 46540) @@ -1371,20 +1371,20 @@ get_directory_property(BRLCAD_BUILD_SCL DIRECTORY src/other DEFINITION BRLCAD_SCL_BUILD) # Build options - SET(BRLCAD_BUILD_TCL_LABEL "Build Tcl ") - SET(BRLCAD_BUILD_TK_LABEL "Build Tk ") - SET(BRLCAD_BUILD_INCRTCL_LABEL "Build Itcl/Itk ") - SET(BRLCAD_BUILD_IWIDGETS_LABEL "Build Iwidgets ") - SET(BRLCAD_BUILD_TKHTML_LABEL "Build Tkhtml ") - SET(BRLCAD_BUILD_TKPNG_LABEL "Build tkpng ") - SET(BRLCAD_BUILD_TKTABLE_LABEL "Build Tktable ") - SET(BRLCAD_BUILD_PNG_LABEL "Build libpng ") - SET(BRLCAD_BUILD_REGEX_LABEL "Build libregex ") - SET(BRLCAD_BUILD_ZLIB_LABEL "Build zlib ") - SET(BRLCAD_BUILD_TERMLIB_LABEL "Build termlib ") - SET(BRLCAD_BUILD_UTAHRLE_LABEL "Build Utah Raster Toolkit ") - SET(BRLCAD_BUILD_OPENNURBS_LABEL "Build openNURBS ") - SET(BRLCAD_BUILD_SCL_LABEL "Build NIST STEP Class Libraries ") + SET(BRLCAD_BUILD_TCL_LABEL "Compile Tcl ") + SET(BRLCAD_BUILD_TK_LABEL "Compile Tk ") + SET(BRLCAD_BUILD_INCRTCL_LABEL "Compile Itcl/Itk ") + SET(BRLCAD_BUILD_IWIDGETS_LABEL "Compile Iwidgets ") + SET(BRLCAD_BUILD_TKHTML_LABEL "Compile Tkhtml ") + SET(BRLCAD_BUILD_TKPNG_LABEL "Compile tkpng ") + SET(BRLCAD_BUILD_TKTABLE_LABEL "Compile Tktable ") + SET(BRLCAD_BUILD_PNG_LABEL "Compile libpng ") + SET(BRLCAD_BUILD_REGEX_LABEL "Compile libregex ") + SET(BRLCAD_BUILD_ZLIB_LABEL "Compile zlib ") + SET(BRLCAD_BUILD_TERMLIB_LABEL "Compile termlib ") + SET(BRLCAD_BUILD_UTAHRLE_LABEL "Compile Utah Raster Toolkit ") + SET(BRLCAD_BUILD_OPENNURBS_LABEL "Compile openNURBS ") + SET(BRLCAD_BUILD_SCL_LABEL "Compile NIST STEP Class Libraries ") SET(BRLCAD-ENABLE_X11_LABEL "X11 support (optional) ") SET(BRLCAD-ENABLE_OPENGL_LABEL "OpenGL support (optional) ") SET(BRLCAD-ENABLE_RTSERVER_LABEL "librtserver JDK support (optional) ") @@ -1413,7 +1413,7 @@ else (BRLCAD-BUILD_EXTRADOCS) set(BRLCAD-BUILD_DOCBUILD_MSG "OFF") endif (BRLCAD_EXTRADOCS) - SET(BRLCAD-BUILD_DOCBUILD_MSG_LABEL "Build extra docs ") + SET(BRLCAD-BUILD_DOCBUILD_MSG_LABEL "Generate extra docs ") SET(SETTINGLIST1 BRLCAD_BUILD_TCL BRLCAD_BUILD_TK BRLCAD_BUILD_INCRTCL BRLCAD_BUILD_IWIDGETS BRLCAD_BUILD_TKHTML BRLCAD_BUILD_TKPNG BRLCAD_BUILD_TKTABLE BRLCAD_BUILD_PNG BRLCAD_BUILD_REGEX BRLCAD_BUILD_ZLIB BRLCAD_BUILD_TERMLIB BRLCAD_BUILD_UTAHRLE BRLCAD_BUILD_OPENNURBS BRLCAD_BUILD_SCL) SET(SETTINGLIST2 BRLCAD-ENABLE_X11 BRLCAD-ENABLE_OPENGL BRLCAD-ENABLE_RTSERVER BRLCAD-ENABLE_RUNTIME_DEBUG ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-09-01 22:49:56
|
Revision: 46548 http://brlcad.svn.sourceforge.net/brlcad/?rev=46548&view=rev Author: starseeker Date: 2011-09-01 22:49:50 +0000 (Thu, 01 Sep 2011) Log Message: ----------- use all the CPUs we can - go with 20 as a good number given current systems (2011) Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-09-01 22:46:05 UTC (rev 46547) +++ brlcad/trunk/CMakeLists.txt 2011-09-01 22:49:50 UTC (rev 46548) @@ -1723,7 +1723,7 @@ COMMAND ${CMAKE_COMMAND} -E make_directory _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build COMMAND ${CMAKE_COMMAND} -E make_directory _${CPACK_SOURCE_PACKAGE_FILE_NAME}-install COMMAND ${CMAKE_COMMAND} -E chdir _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build ${CMAKE_COMMAND} ../${CPACK_SOURCE_PACKAGE_FILE_NAME} -DBRLCAD_BUNDLED_LIBS="Bundled" -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install - COMMAND ${CMAKE_COMMAND} --build _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build -- -j3 + COMMAND ${CMAKE_COMMAND} --build _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build -- -j20 COMMAND ${CMAKE_COMMAND} --build _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target regress COMMAND TIMEFRAME=1 ${CMAKE_COMMAND} --build _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target benchmark COMMAND ${CMAKE_COMMAND} --build _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target install This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <eri...@us...> - 2011-09-02 10:55:47
|
Revision: 46551 http://brlcad.svn.sourceforge.net/brlcad/?rev=46551&view=rev Author: erikgreenwald Date: 2011-09-02 10:55:40 +0000 (Fri, 02 Sep 2011) Log Message: ----------- Remove -j20. Parallel builds should be at the builders explicit request to avoid accidentally hammering the machine. Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-09-02 02:43:07 UTC (rev 46550) +++ brlcad/trunk/CMakeLists.txt 2011-09-02 10:55:40 UTC (rev 46551) @@ -1729,7 +1729,7 @@ COMMAND ${CMAKE_COMMAND} -E make_directory _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build COMMAND ${CMAKE_COMMAND} -E make_directory _${CPACK_SOURCE_PACKAGE_FILE_NAME}-install COMMAND ${CMAKE_COMMAND} -E chdir _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build ${CMAKE_COMMAND} ../${CPACK_SOURCE_PACKAGE_FILE_NAME} -DBRLCAD_BUNDLED_LIBS="Bundled" -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/_${CPACK_SOURCE_PACKAGE_FILE_NAME}-install - COMMAND ${CMAKE_COMMAND} --build _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build -- -j20 + COMMAND ${CMAKE_COMMAND} --build _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build COMMAND ${CMAKE_COMMAND} --build _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target regress COMMAND TIMEFRAME=1 ${CMAKE_COMMAND} --build _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target benchmark COMMAND ${CMAKE_COMMAND} --build _${CPACK_SOURCE_PACKAGE_FILE_NAME}-build --target install This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <d_r...@us...> - 2011-09-02 12:59:27
|
Revision: 46552 http://brlcad.svn.sourceforge.net/brlcad/?rev=46552&view=rev Author: d_rossberg Date: 2011-09-02 12:59:20 +0000 (Fri, 02 Sep 2011) Log Message: ----------- WIN32 is an add_executable() flag => sort it out from the source file names too because it's a CMake variable it has to be prefixed by a "x" e.g. Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-09-02 10:55:40 UTC (rev 46551) +++ brlcad/trunk/CMakeLists.txt 2011-09-02 12:59:20 UTC (rev 46552) @@ -199,7 +199,7 @@ MACRO(CMAKEFILES) IF(NOT BRLCAD-IS_SUBBUILD) FOREACH(ITEM ${ARGN}) - IF(NOT ${ITEM} MATCHES "^SHARED$" AND NOT ${ITEM} MATCHES "^STATIC$") + IF(NOT ${ITEM} MATCHES "^SHARED$" AND NOT ${ITEM} MATCHES "^STATIC$" AND NOT x${ITEM} MATCHES "^xWIN32$") GET_FILENAME_COMPONENT(ITEM_PATH ${ITEM} PATH) GET_FILENAME_COMPONENT(ITEM_NAME ${ITEM} NAME) IF(ITEM_PATH) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-09-02 16:54:31
|
Revision: 46557 http://brlcad.svn.sourceforge.net/brlcad/?rev=46557&view=rev Author: starseeker Date: 2011-09-02 16:54:24 +0000 (Fri, 02 Sep 2011) Log Message: ----------- Get a bit fancier with the package name and version for RPMs - commented out by default, but available if desired. Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-09-02 16:21:29 UTC (rev 46556) +++ brlcad/trunk/CMakeLists.txt 2011-09-02 16:54:24 UTC (rev 46557) @@ -1642,7 +1642,19 @@ SET(CPACK_RPM_PACKAGE_LICENSE "LGPL 2.1") SET(CPACK_RPM_PACKAGE_GROUP "Applications/Engineering") #SET(CPACK_RPM_PACKAGE_NAME "brlcad_${BRLCAD_MAJOR_VERSION}_${BRLCAD_MINOR_VERSION}_${BRLCAD_PATCH_VERSION}") - #SET(CPACK_RPM_PACKAGE_RELEASE 2) + #IF(EXISTS /etc/redhat-release) + # FILE(READ /etc/redhat-release REDHAT_RELEASE) + # STRING(REGEX MATCH "[0-9]+" REDHAT_VERSION ${REDHAT_RELEASE}) + # STRING(REGEX MATCH "Enterprise Linux" LINUX_DIST_TYPE ${REDHAT_RELEASE}) + # IF(LINUX_DIST_TYPE) + # SET(LINUX_DIST_TYPE "el") + # ELSE(LINUX_DIST_TYPE) + # SET(LINUX_DIST_TYPE "rh") + # ENDIF(LINUX_DIST_TYPE) + # SET(CPACK_RPM_PACKAGE_RELEASE 2.${LINUX_DIST_TYPE}${REDHAT_VERSION}) + #ELSE(EXISTS /etc/redhat-release) + # #SET(CPACK_RPM_PACKAGE_RELEASE 2) + #ENDIF(EXISTS /etc/redhat-release) ENDIF(RPMBUILD_EXEC) IF(${CMAKE_CPU_TYPE} STREQUAL "32BIT" AND ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") SET(CPACK_PACKAGE_FILE_NAME "BRL-CAD_${BRLCAD_VERSION}_${CMAKE_SYSTEM_NAME}_x86") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sta...@us...> - 2011-09-04 20:51:01
|
Revision: 46566 http://brlcad.svn.sourceforge.net/brlcad/?rev=46566&view=rev Author: starseeker Date: 2011-09-04 20:50:54 +0000 (Sun, 04 Sep 2011) Log Message: ----------- Ah, right - using cfg in the path messes with the file placements we need to run in build dir. Modified Paths: -------------- brlcad/trunk/CMakeLists.txt Modified: brlcad/trunk/CMakeLists.txt =================================================================== --- brlcad/trunk/CMakeLists.txt 2011-09-04 15:30:51 UTC (rev 46565) +++ brlcad/trunk/CMakeLists.txt 2011-09-04 20:50:54 UTC (rev 46566) @@ -465,16 +465,16 @@ STRING(TOUPPER "${CFG_TYPE}" CFG_TYPE) IF(NOT "CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE}") IF(WIN32) - SET("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/${CFG_TYPE}/bin CACHE INTERNAL "Single output directory for building ${CFG_TYPE} libraries.") + SET("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/bin CACHE INTERNAL "Single output directory for building ${CFG_TYPE} libraries.") ELSE(WIN32) - SET("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/${CFG_TYPE}/lib CACHE INTERNAL "Single output directory for building ${CFG_TYPE} libraries.") + SET("CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/lib CACHE INTERNAL "Single output directory for building ${CFG_TYPE} libraries.") ENDIF(WIN32) ENDIF(NOT "CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE}") IF(NOT "CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE}") - SET("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/${CFG_TYPE}/lib CACHE INTERNAL "Single output directory for building ${CFG_TYPE} archives.") + SET("CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/lib CACHE INTERNAL "Single output directory for building ${CFG_TYPE} archives.") ENDIF(NOT "CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE}") IF(NOT "CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE}") - SET("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/${CFG_TYPE}/bin CACHE INTERNAL "Single output directory for building ${CFG_TYPE} executables.") + SET("CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE}" ${BRLCAD_BINARY_DIR}/bin CACHE INTERNAL "Single output directory for building ${CFG_TYPE} executables.") ENDIF(NOT "CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE}") ENDFOREACH() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |