diff options
| author | Josh Blum | 2012-04-16 12:10:46 -0700 |
|---|---|---|
| committer | Josh Blum | 2012-04-19 18:12:56 -0700 |
| commit | cacfd391b8bfde1331158612ec1376f27cb7391f (patch) | |
| tree | 1fe945bdd68b68beb1bea6c77d74c370a1f52315 /volk/lib | |
| parent | 4e86843aa236c4fabac35f236f22d16cd8fea99b (diff) | |
| download | gnuradio-cacfd391b8bfde1331158612ec1376f27cb7391f.tar.gz gnuradio-cacfd391b8bfde1331158612ec1376f27cb7391f.tar.bz2 gnuradio-cacfd391b8bfde1331158612ec1376f27cb7391f.zip | |
volk: build system work, can build stand-alone msvc
Diffstat (limited to 'volk/lib')
| -rw-r--r-- | volk/lib/CMakeLists.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt index 06057ff87..fece1b7d8 100644 --- a/volk/lib/CMakeLists.txt +++ b/volk/lib/CMakeLists.txt @@ -61,7 +61,11 @@ macro(check_arch arch_name) set(have_${arch_name} TRUE) foreach(flag ${flags}) include(CheckCXXCompilerFlag) - set(have_flag have_${flag}) + set(have_flag have${flag}) + execute_process( #make the have_flag have nice alphanum chars (just for looks/not necessary) + COMMAND ${PYTHON_EXECUTABLE} -c "import re; print(re.sub('\\W', '_', '${have_flag}'))" + OUTPUT_VARIABLE have_flag OUTPUT_STRIP_TRAILING_WHITESPACE + ) CHECK_CXX_COMPILER_FLAG(${flag} ${have_flag}) if (NOT ${have_flag}) set(have_${arch_name} FALSE) @@ -232,7 +236,8 @@ PROPERTIES COMPILE_DEFINITIONS "${machine_defs}") if(MSVC) #add compatibility includes for stdint types - include_directories(${CMAKE_SOURCE_DIR}/msvc) + include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc) + add_definitions(-DHAVE_CONFIG_H) #compile the sources as C++ due to the lack of complex.h under MSVC set_source_files_properties(${volk_sources} PROPERTIES LANGUAGE CXX) endif() |