Revision: 58307
http://sourceforge.net/p/brlcad/code/58307
Author: brlcad
Date: 2013-10-25 18:27:25 +0000 (Fri, 25 Oct 2013)
Log Message:
-----------
needs testing, but should no longer need the MSVC conditionals. It should
default to msvc's default linkage (/MT) and is synchronized with the top-level
build settings.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2013-10-25 18:18:24 UTC (rev
58306)
+++ brlcad/trunk/src/other/CMakeLists.txt 2013-10-25 18:27:25 UTC (rev
58307)
@@ -27,35 +27,31 @@
#-----------------------------------------------------------------------
# Clear all pre-defined CMake flags
-# TODO - clearing these flags on MSVC currently causes
-# problems...
-if(NOT MSVC)
- set(CMAKE_C_FLAGS "")
- set(CMAKE_CXX_FLAGS "")
- set(CMAKE_SHARED_LINKER_FLAGS "")
- set(CMAKE_EXE_LINKER_FLAGS "")
+set(CMAKE_C_FLAGS "")
+set(CMAKE_CXX_FLAGS "")
+set(CMAKE_SHARED_LINKER_FLAGS "")
+set(CMAKE_EXE_LINKER_FLAGS "")
- if(CMAKE_BUILD_TYPE)
- string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_UPPER)
- set(CMAKE_C_FLAGS_${BUILD_TYPE_UPPER} "")
- set(CMAKE_CXX_FLAGS_${BUILD_TYPE_UPPER} "")
- set(CMAKE_SHARED_LINKER_FLAGS_${BUILD_TYPE_UPPER} "")
- set(CMAKE_EXE_LINKER_FLAGS_${BUILD_TYPE_UPPER} "")
- endif(CMAKE_BUILD_TYPE)
+if(CMAKE_BUILD_TYPE)
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE_UPPER)
+ set(CMAKE_C_FLAGS_${BUILD_TYPE_UPPER} "")
+ set(CMAKE_CXX_FLAGS_${BUILD_TYPE_UPPER} "")
+ set(CMAKE_SHARED_LINKER_FLAGS_${BUILD_TYPE_UPPER} "")
+ set(CMAKE_EXE_LINKER_FLAGS_${BUILD_TYPE_UPPER} "")
+endif(CMAKE_BUILD_TYPE)
- foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
- string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
- set(CMAKE_C_FLAGS_${CFG_TYPE_UPPER} "")
- set(CMAKE_CXX_FLAGS_${CFG_TYPE_UPPER} "")
- set(CMAKE_SHARED_LINKER_FLAGS_${CFG_TYPE_UPPER} "")
- set(CMAKE_EXE_LINKER_FLAGS_${CFG_TYPE_UPPER} "")
- endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
+foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
+ string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
+ set(CMAKE_C_FLAGS_${CFG_TYPE_UPPER} "")
+ set(CMAKE_CXX_FLAGS_${CFG_TYPE_UPPER} "")
+ set(CMAKE_SHARED_LINKER_FLAGS_${CFG_TYPE_UPPER} "")
+ set(CMAKE_EXE_LINKER_FLAGS_${CFG_TYPE_UPPER} "")
+endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
- set(CMAKE_C_FLAGS "$ENV{CFLAGS}")
- set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS}")
- set(CMAKE_SHARED_LINKER_FLAGS "$ENV{LDFLAGS}")
-endif(NOT MSVC)
+set(CMAKE_C_FLAGS "$ENV{CFLAGS}")
+set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS}")
+set(CMAKE_SHARED_LINKER_FLAGS "$ENV{LDFLAGS}")
# Quiet all warnings in this directory
if(BRLCAD_DISABLE_SRC_OTHER_WARN)
@@ -827,9 +823,6 @@
")
THIRD_PARTY(openNURBS openNURBS "" opennurbs_ALIASES opennurbs_DESCRIPTION
NOSYS)
-if(NOT MSVC)
- set(NOT_MSVC 1)
-endif(NOT MSVC)
# STEP Class Libraries
# Need Lemon/Perplex to build STEP - conditionalize
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135991&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
