[ADD] VC no longer creates unwanted release and debug path but rather creates...

[ADD] VC no longer creates unwanted release and debug path but rather creates names for debug with d in the name like in OSG

src/CMakeLists.txt

@@ -152,6 +152,8 @@ IF( CMAKE_GENERATOR MATCHES "Visual Studio" )
     SET( CMAKE_SHARED_LINKER_FLAGS " /STACK:10000000 /machine:I386 /NODEFAULTLIB:${EXCLUDE_LIBRARIES}"  CACHE STRING "" FORCE )
     SET( CMAKE_EXE_LINKER_FLAGS " /STACK:10000000 /machine:I386 /NODEFAULTLIB:${EXCLUDE_LIBRARIES}"  CACHE STRING "" FORCE )
     SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D \"NOMINMAX\"" )
+    SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP" )
+	SET( CMAKE_DEBUG_POSTFIX "d" CACHE STRING "add a postfix, usually d on windows" )
 ELSE()
     # Unfortunately libstdc++'s header files don't work with mingw in ansi mode (basically libstdc++'s fault)
     IF( CMAKE_HOST_SYSTEM MATCHES "Windows" )
@@ -208,6 +210,11 @@ ENDIF()
 ADD_EXECUTABLE( walnut OpenWalnut.cpp version.h )
 TARGET_LINK_LIBRARIES( walnut OWkernel OWdataHandler OWgui OWguiqt4 OWcommon OWge ${Boost_LIBRARIES} )
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( walnut PROPERTIES DEBUG_POSTFIX "d")
+	SET_TARGET_PROPERTIES( walnut PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 #---------- Shaders -------------
 option( OW_COPY_SHADERS "This enables copying shaders with every make call." ON )
 if( OW_COPY_SHADERS )

src/common/CMakeLists.txt

@@ -10,6 +10,10 @@ ADD_SUBDIRECTORY( math )
 ADD_LIBRARY( OWcommon SHARED ${COMMON_SRC} ${COMMON_DATASTRUCTURES_SRC} ${COMMON_EXCEPTIONS_SRC} ${MATH_SRC} ${FIBERSIMILARITY_SRC} )
 TARGET_LINK_LIBRARIES( OWcommon ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} )
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( OWcommon PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 # Set the prefix and suffix of dynamically loadable modules to match
 # CMAKEs naming of them. The quotes are necessary so the shell doesn't mess
 # with these defines. Unfortunately, the Visual Studio has problems handling

src/dataHandler/CMakeLists.txt

@@ -24,6 +24,11 @@ FILE( GLOB DATAHANDLER_IO_SRC "io/*.cpp" "io/*.h" ) # former WLoader
         TARGET_LINK_LIBRARIES( OWdataHandler OWcommon ${Boost_LIBRARIES} OWext_niftiio OWext_biosig OWext_eep ${OPENSCENEGRAPH_LIBRARIES} )
     ENDIF()
 #ENDIF()
+
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( OWdataHandler PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 # Unit tests
 IF( OW_COMPILE_TESTS )
     # in case of not installed ITK the unit test won't compile, so we remove it

src/ext/libeep/CMakeLists.txt

@@ -16,3 +16,7 @@ IF( CMAKE_GENERATOR MATCHES "Visual Studio" )
 ELSE()
 	TARGET_LINK_LIBRARIES( OWext_eep m )
 ENDIF()
+
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( OWext_eep PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)

src/ext/nifti/CMakeLists.txt

@@ -42,6 +42,9 @@ SET(NIFTI_NIFTILIB_NAME ${PACKAGE_PREFIX}niftiio)
 ADD_LIBRARY(${NIFTI_NIFTILIB_NAME} ${NIFTILIB_SRC} )
 TARGET_LINK_LIBRARIES( ${NIFTI_NIFTILIB_NAME} ${PACKAGE_PREFIX}znz)
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( ${NIFTI_NIFTILIB_NAME} PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
 
 IF(UNIX)
   TARGET_LINK_LIBRARIES(${NIFTI_NIFTILIB_NAME} -lm)

src/graphicsEngine/CMakeLists.txt

@@ -10,6 +10,10 @@ FILE( GLOB GE_SRC "*.cpp" "*.h" )
 ADD_LIBRARY( OWge SHARED ${GE_SRC} ${GE_EXCEPTIONS_SRC} ${GE_CALLBACKS_SRC} ${GE_ALGORITHMS_SRC} )
 TARGET_LINK_LIBRARIES( OWge OWcommon ${OPENGL_gl_LIBRARY} ${OPENSCENEGRAPH_LIBRARIES} )
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( OWge PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 # Unit tests
 IF( OW_COMPILE_TESTS )
   CXXTEST_ADD_TESTS_FROM_LIST( "${GE_SRC}" "OWge;OWkernel"

src/gui/CMakeLists.txt

@@ -5,6 +5,10 @@ FILE( GLOB GUI_SRC "*.cpp" "*.h" )
 ADD_LIBRARY( OWgui ${GUI_SRC} )
 TARGET_LINK_LIBRARIES( OWgui OWcommon )
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( OWgui PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 # Unit tests
 IF( OW_COMPILE_TESTS )
   CXXTEST_ADD_TESTS_FROM_LIST( "${GUI_SRC}"

src/gui/qt4/CMakeLists.txt

@@ -41,3 +41,7 @@ FILE(GLOB GUI_QT4_SRC "*.cpp" "guiElements/*.cpp" "controlPanel/*.cpp" "ribbonMe
 
 ADD_LIBRARY( OWguiqt4 ${GUI_QT4_SRC} ${GUI_QT4_MOC_SRCS} )
 TARGET_LINK_LIBRARIES( OWguiqt4 OWcommon OWgui OWge OWkernel ${QT_LIBS} ${Boost_LIBRARIES} )
+
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( OWguiqt4 PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)

src/kernel/CMakeLists.txt

@@ -8,6 +8,10 @@ FILE( GLOB KERNEL_COMBINER_SRC "combiner/*.cpp" "combiner/*.h" )
 ADD_LIBRARY( OWkernel SHARED ${KERNEL_SRC} ${MODULES_SRC} ${KERNEL_EXCEPTIONS_SRC} ${KERNEL_COMBINER_SRC} )
 TARGET_LINK_LIBRARIES( OWkernel OWcommon OWdataHandler OWge ${OPENSCENEGRAPH_LIBRARIES} ${CMAKE_DL_LIBS} )
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( OWkernel PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 # Unit tests
 IF( OW_COMPILE_TESTS )
     #    SET( testLibs guiqt4 )

src/kernel/WModuleLoader.cpp

@@ -56,8 +56,21 @@ void WModuleLoader::load( WSharedAssociativeContainer< std::set< boost::shared_p
         std::string suffix = wiotools::getSuffix( i->leaf() );
         std::string stem = i->path().stem();
 
+#ifdef _MSC_VER
+        std::string supposedFilename = getModulePrefix() + '_' + i->path().parent_path().filename()
+#ifdef _DEBUG
+            + 'd'
+#endif
+            + WSharedLib::getSystemSuffix();
+        std::string isFileName = i->path().filename();
+#endif // _MSC_VER
+
         if( !boost::filesystem::is_directory( *i ) && ( suffix == WSharedLib::getSystemSuffix() ) &&
-            ( stem.compare( 0, getModulePrefix().length(), getModulePrefix() ) == 0 ) )
+            ( stem.compare( 0, getModulePrefix().length(), getModulePrefix() ) == 0 )
+#ifdef _MSC_VER
+            && supposedFilename == isFileName
+#endif
+            )
         {
             try
             {
@@ -104,19 +117,6 @@ void WModuleLoader::load( WSharedAssociativeContainer< std::set< boost::shared_p
             // if it a dir -> traverse down
             load( ticket, *i, level + 1 );
         }
-        // this little construct will enable vc to find the dll's in the correct build mode we are in
-#ifdef _MSC_VER
-        else if ( ( level == 1 ) &&
-#ifdef _DEBUG
-            boost::filesystem::path( *i ).filename() == "Debug"
-#else // _DEBUG
-            boost::filesystem::path( *i ).filename() == "Release"
-#endif // _DEBUG
-            )
-        {
-            load( ticket, *i, level + 1 );
-        }
-#endif // _MSC_VER
     }
 }
 

src/modules/HARDIToSphericalHarmonics/CMakeLists.txt

@@ -12,6 +12,10 @@ SET( MODULE_NAME    "OWmodule_${MODULE_NAME}" )      # prefix all module names w
 ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
 TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel )
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 # Copy local shaders to module target directory
 IF( OW_COPY_SHADERS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/shaders )    # copy shaders only if the user wants it
     ADD_CUSTOM_TARGET( ${MODULE_NAME}_CopyShaders

src/modules/applyMask/CMakeLists.txt

@@ -12,6 +12,10 @@ SET( MODULE_NAME    "OWmodule_${MODULE_NAME}" )      # prefix all module names w
 ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
 TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel )
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 # Copy local shaders to module target directory
 IF( OW_COPY_SHADERS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/shaders )    # copy shaders only if the user wants it
     ADD_CUSTOM_TARGET( ${MODULE_NAME}_CopyShaders

src/modules/arbitraryPlane/CMakeLists.txt

@@ -12,6 +12,10 @@ SET( MODULE_NAME    "OWmodule_${MODULE_NAME}" )      # prefix all module names w
 ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
 TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel )
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 # Copy local shaders to module target directory
 IF( OW_COPY_SHADERS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/shaders )    # copy shaders only if the user wants it
     ADD_CUSTOM_TARGET( ${MODULE_NAME}_CopyShaders

src/modules/arbitraryRois/CMakeLists.txt

@@ -12,6 +12,10 @@ SET( MODULE_NAME    "OWmodule_${MODULE_NAME}" )      # prefix all module names w
 ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
 TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel )
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 # Copy local shaders to module target directory
 IF( OW_COPY_SHADERS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/shaders )    # copy shaders only if the user wants it
     ADD_CUSTOM_TARGET( ${MODULE_NAME}_CopyShaders

src/modules/atlasSurfaces/CMakeLists.txt

@@ -12,6 +12,10 @@ SET( MODULE_NAME    "OWmodule_${MODULE_NAME}" )      # prefix all module names w
 ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
 TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel )
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 # Copy local shaders to module target directory
 IF( OW_COPY_SHADERS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/shaders )    # copy shaders only if the user wants it
     ADD_CUSTOM_TARGET( ${MODULE_NAME}_CopyShaders

src/modules/bermanTracking/CMakeLists.txt

@@ -12,6 +12,10 @@ SET( MODULE_NAME    "OWmodule_${MODULE_NAME}" )      # prefix all module names w
 ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
 TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel ${Teem_LIBRARIES} )
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 # Copy local shaders to module target directory
 IF( OW_COPY_SHADERS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/shaders )    # copy shaders only if the user wants it
     ADD_CUSTOM_TARGET( ${MODULE_NAME}_CopyShaders

src/modules/boundingBox/CMakeLists.txt

@@ -12,6 +12,10 @@ SET( MODULE_NAME    "OWmodule_${MODULE_NAME}" )      # prefix all module names w
 ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
 TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel )
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 # Copy local shaders to module target directory
 IF( OW_COPY_SHADERS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/shaders )    # copy shaders only if the user wants it
     ADD_CUSTOM_TARGET( ${MODULE_NAME}_CopyShaders

src/modules/calculateGFA/CMakeLists.txt

@@ -12,6 +12,10 @@ SET( MODULE_NAME    "OWmodule_${MODULE_NAME}" )      # prefix all module names w
 ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
 TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel ${Teem_LIBRARIES} )
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 # Copy local shaders to module target directory
 IF( OW_COPY_SHADERS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/shaders )    # copy shaders only if the user wants it
     ADD_CUSTOM_TARGET( ${MODULE_NAME}_CopyShaders

src/modules/clusterDisplay/CMakeLists.txt

@@ -12,6 +12,10 @@ SET( MODULE_NAME    "OWmodule_${MODULE_NAME}" )      # prefix all module names w
 ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
 TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel )
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 # Copy local shaders to module target directory
 IF( OW_COPY_SHADERS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/shaders )    # copy shaders only if the user wants it
     ADD_CUSTOM_TARGET( ${MODULE_NAME}_CopyShaders

src/modules/clusterParamDisplay/CMakeLists.txt

@@ -12,6 +12,10 @@ SET( MODULE_NAME    "OWmodule_${MODULE_NAME}" )      # prefix all module names w
 ADD_LIBRARY( ${MODULE_NAME} SHARED ${MODULES_SRC} )
 TARGET_LINK_LIBRARIES( ${MODULE_NAME} OWkernel )
 
+IF(MSVC_IDE)
+	SET_TARGET_PROPERTIES( ${MODULE_NAME} PROPERTIES PREFIX "../")    
+ENDIF(MSVC_IDE)
+
 # Copy local shaders to module target directory
 IF( OW_COPY_SHADERS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/shaders )    # copy shaders only if the user wants it
     ADD_CUSTOM_TARGET( ${MODULE_NAME}_CopyShaders